gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-22 22:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Define new variable INTERNAL_LIBRARIES_DEPEND_UPON which is built by

Browse source 
running which_lib (but only if needed) on LIBRARIES_DEPEND_UPON etc


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12255 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-01-29 13:43:56 +00:00
parent 5d488f9d43
commit d13f8734de
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clibrary.make
View file

@ -101,6 +101,14 @@ endif
# library_combo - this variable is PRIVATE to gnustep-make
FINAL_LIBRARY_INSTALL_DIR = $(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)
INTERNAL_LIBRARIES_DEPEND_UPON = \
$(shell $(WHICH_LIB_SCRIPT) \
$($(INTERNAL_library_NAME)_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) \
$(ALL_LIB_DIRS) \
$(LIBRARIES_DEPEND_UPON) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
ifeq ($(shared), yes)
ifneq ($(BUILD_DLL),yes)
@ -189,7 +197,8 @@ $(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(OBJ_FILES_TO_LINK) \
--def $(DERIVED_SOURCES)/$(INTERNAL_clibrary_NAME).def \
-o $@ $(OBJ_FILES_TO_LINK) \
$(ALL_LIB_DIRS) \
$(LIBRARIES_DEPEND_UPON) $(TARGET_SYSTEM_LIBS) $(SHARED_LD_POSTFLAGS)
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(TARGET_SYSTEM_LIBS) \
$(SHARED_LD_POSTFLAGS)
else # BUILD_DLL

11
library.make
View file

@ -116,6 +116,14 @@ endif
# is PRIVATE to gnustep-make
FINAL_LIBRARY_INSTALL_DIR = $(LIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
INTERNAL_LIBRARIES_DEPEND_UPON = \
$(shell $(WHICH_LIB_SCRIPT) \
$($(INTERNAL_library_NAME)_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) \
$(ALL_LIB_DIRS) \
$(LIBRARIES_DEPEND_UPON) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
ifeq ($(shared), yes)
ifneq ($(BUILD_DLL),yes)
@ -238,7 +246,8 @@ $(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(OBJ_FILES_TO_LINK) \
--def $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def \
-o $@ $(OBJ_FILES_TO_LINK) \
$(ALL_LIB_DIRS) \
$(LIBRARIES_DEPEND_UPON) $(TARGET_SYSTEM_LIBS) $(SHARED_LD_POSTFLAGS)
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(TARGET_SYSTEM_LIBS) \
$(SHARED_LD_POSTFLAGS)
else # BUILD_DLL