More extensive usage of LIBRARY_NAME_WITH_LIB

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17933 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2003-10-19 19:46:52 +00:00
parent 35ac4f7ba3
commit 05ff1de962

View file

@ -176,7 +176,7 @@ DLL_DEF = $($(GNUSTEP_INSTANCE)_DLL_DEF)
DLL_DEF_FILES = $(SUBPROJECT_DEF_FILES) $(DLL_DEF)
ifneq ($(strip $(DLL_DEF_FILES)),)
DLL_DEF_INP = $(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE).inp
DLL_DEF_INP = $(DERIVED_SOURCES_DIR)/$(LIBRARY_NAME_WITH_LIB).inp
$(DLL_DEF_INP): $(DLL_DEF_FILES)
cat $(DLL_DEF_FILES) > $@
@ -195,7 +195,7 @@ internal-library-all_:: \
$(GNUSTEP_OBJ_DIR) \
$(DERIVED_SOURCES_DIR) \
$(DLL_DEF_INP) \
$(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE).def \
$(DERIVED_SOURCES_DIR)/$(LIBRARY_NAME_WITH_LIB).def \
$(GNUSTEP_OBJ_DIR)/$(DLL_NAME) \
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB)
@ -205,17 +205,17 @@ internal-library-clean::
$(DERIVED_SOURCES_DIR):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
$(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE).def: $(OBJ_FILES_TO_LINK) $(DLL_DEF_INP)
$(DERIVED_SOURCES_DIR)/$(LIBRARY_NAME_WITH_LIB).def: $(OBJ_FILES_TO_LINK) $(DLL_DEF_INP)
$(ECHO_NOTHING)$(DLLTOOL) $(DLL_DEF_FLAG) --output-def $@ $(OBJ_FILES_TO_LINK)$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB): $(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE).def
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB): $(DERIVED_SOURCES_DIR)/$(LIBRARY_NAME_WITH_LIB).def
$(ECHO_NOTHING)$(DLLTOOL) --dllname $(DLL_NAME) --def $< --output-lib $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(OBJ_FILES_TO_LINK) \
$(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE).def
$(DERIVED_SOURCES_DIR)/$(LIBRARY_NAME_WITH_LIB).def
$(ECHO_LINKING)$(DLLWRAP) --driver-name $(CC) \
$(SHARED_LD_PREFLAGS) \
--def $(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE).def \
--def $(DERIVED_SOURCES_DIR)/$(LIBRARY_NAME_WITH_LIB).def \
-o $@ $(OBJ_FILES_TO_LINK) \
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(TARGET_SYSTEM_LIBS) \
$(SHARED_LD_POSTFLAGS)$(END_ECHO)