mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 14:20:50 +00:00
Query-replaced LIBRARIES_DEPEND_UPON with the new INTERNAL_LIBRARIES_DEPEND_UPON
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12256 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d13f8734de
commit
7f391bb8e4
1 changed files with 16 additions and 16 deletions
32
target.make
32
target.make
|
@ -156,7 +156,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
-o $@ \
|
||||
-framework Foundation \
|
||||
-framework System \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
-lobjc -lgcc $^ $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
@ -168,7 +168,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
-read_only_relocs warning -undefined warning \
|
||||
-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) \
|
||||
-o $@ \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
-framework Foundation \
|
||||
$^ $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
|
@ -248,7 +248,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
-install_name $(DYLIB_INSTALL_NAME) \
|
||||
-o $@ \
|
||||
$(DYLIB_DEF_FRAMEWORKS) \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
-lobjc $^ $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
@ -267,7 +267,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
$(DYLIB_EXTRA_FLAGS) \
|
||||
-install_name $(DYLIB_INSTALL_NAME) \
|
||||
-o $@ \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(DYLIB_DEF_FRAMEWORKS) \
|
||||
$(DYLIB_DEF_LIBS) \
|
||||
$^ $(SHARED_LD_POSTFLAGS); \
|
||||
|
@ -348,7 +348,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
-install_name $(DYLIB_INSTALL_NAME) \
|
||||
-o $@ \
|
||||
$(DYLIB_DEF_FRAMEWORKS) \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
-lobjc $^ $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
@ -367,7 +367,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
$(DYLIB_EXTRA_FLAGS) \
|
||||
-install_name $(DYLIB_INSTALL_NAME) \
|
||||
-o $@ \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(DYLIB_DEF_FRAMEWORKS) \
|
||||
$(DYLIB_DEF_LIBS) \
|
||||
$^ $(SHARED_LD_POSTFLAGS); \
|
||||
|
@ -432,7 +432,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) \
|
||||
-o $@ \
|
||||
-framework System \
|
||||
$(LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
|
||||
-lobjc -lgcc $^ $(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
@ -442,7 +442,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
-dynamic -read_only_relocs suppress $(ARCH_FLAGS) \
|
||||
-install_name $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE) $(ALL_LDFLAGS) $@ \
|
||||
-framework System \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(LIBRARIES_FOUNDATION_DEPEND_UPON) $^ \
|
||||
$(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
|
@ -500,7 +500,7 @@ ifneq ($(OBJC_COMPILER), NeXT)
|
|||
SHARED_LIB_LINK_CMD = \
|
||||
/bin/libtool $(SHARED_LD_PREFLAGS) -dynamic -read_only_relocs suppress \
|
||||
$(ARCH_FLAGS) -o $@ -framework System \
|
||||
$(LIBRARIES_DEPEND_UPON) -lobjc -lgcc -undefined warning $^ \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) -lobjc -lgcc -undefined warning $^ \
|
||||
$(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
@ -509,7 +509,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
/bin/libtool $(SHARED_LD_PREFLAGS) \
|
||||
-dynamic -read_only_relocs suppress $(ARCH_FLAGS) -o $@ \
|
||||
-framework System \
|
||||
$(LIBRARIES_DEPEND_UPON) $^ \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) $^ \
|
||||
$(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
@ -544,7 +544,7 @@ HAVE_SHARED_LIBS = yes
|
|||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -shared -Wl,-soname,$(SONAME_LIBRARY_FILE) \
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
|
@ -554,7 +554,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(LIBRARIES_DEPEND_UPON) \
|
||||
$^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
|
@ -639,7 +639,7 @@ HAVE_SHARED_LIBS = yes
|
|||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(SONAME_LIBRARY_FILE) \
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
|
@ -648,7 +648,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(SONAME_FRAMEWORK_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(LIBRARIES_DEPEND_UPON) \
|
||||
$^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \
|
||||
|
@ -950,7 +950,7 @@ HAVE_SHARED_LIBS = yes
|
|||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -G -Wl,-h,$(SONAME_LIBRARY_FILE) \
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
|
@ -960,7 +960,7 @@ SHARED_LIB_LINK_CMD = \
|
|||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) $(SHARED_LD_PREFLAGS) -G -Wl,-h,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(LIBRARIES_DEPEND_UPON) \
|
||||
$^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS);\
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
|
|
Loading…
Reference in a new issue