Use the new variable OBJ_FILES_TO_LINK defined by rules.make

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@10908 72102866-910b-0410-8b05-ffd578937521
Deek · Sep 15, 2001 · 10206d9 · 10206d9
1 parent ff1f202
commit 10206d9
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 50 deletions.
diff --git a/application.make b/application.make
@@ -133,10 +133,9 @@ endif
 # Internal targets
 #
 
-$(APP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
-	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-		$(SUBPROJECT_OBJ_FILES) \
-		$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
+$(APP_FILE): $(OBJ_FILES_TO_LINK)
+	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
+	      $(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
 ifeq ($(OBJC_COMPILER), NeXT)
 	@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
 		>$(APP_DIR_NAME)/library_paths.openapp

diff --git a/bundle.make b/bundle.make
@@ -158,21 +158,18 @@ build-bundle:: $(BUNDLE_FILE) \
 
 ifeq ($(WITH_DLL),yes)
 
-$(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-                 $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
+$(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
 	$(DLLWRAP) --driver-name $(CC) \
 		-o $(LDOUT)$(BUNDLE_FILE) \
-		$(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-                $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES) \
+		$(OBJ_FILES_TO_LINK) \
 		$(ALL_FRAMEWORKS_DIRS) $(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
 
 else # WITH_DLL
 
-$(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-                 $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
+$(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
 	$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
 		-o $(LDOUT)$(BUNDLE_FILE) \
-		$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
+		$(OBJ_FILES_TO_LINK)
 		$(ALL_FRAMEWORK_DIRS) $(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
 
 endif # WITH_DLL

diff --git a/framework.make b/framework.make
@@ -225,9 +225,7 @@ OBJC_OBJ_FILES_TO_INSPECT = $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
 # FIXME - I don't think we can depend on GNUmakefile - rather we should 
 # FORCE then because GNUmakefile might include other arbitrary files outside
 # our control
-$(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(C_OBJ_FILES) \
-                         $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
-                         $(OBJ_FILES) GNUmakefile
+$(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES) $(OBJ_FILES_TO_LINK) GNUmakefile
 	@ classes=""; \
 	for f in $(OBJC_OBJ_FILES_TO_INSPECT) __dummy__; do \
 	  if [ "$$f" != "__dummy__" ]; then \
@@ -295,18 +293,15 @@ build-framework:: $(FRAMEWORK_FILE) \
 
 ifeq ($(WITH_DLL),yes)
 
-$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(C_OBJ_FILES) \
-                    $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
+$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(OBJ_FILES_TO_LINK)
 	$(DLLWRAP) --driver-name $(CC) \
 		-o $(LDOUT)$(FRAMEWORK_FILE) \
-		$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
-                $(OBJ_FILES) \
+		$(OBJ_FILES_TO_LINK) \
 		$(ALL_LIB_DIRS) $(ALL_FRAMEWORK_LIBS)
 
 else # without DLL
 
-$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(C_OBJ_FILES) \
-                    $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
+$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(OBJ_FILES_TO_LINK)
 	$(FRAMEWORK_LINK_CMD)
 	@(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
 	  rm -f $(INTERNAL_framework_NAME); \

diff --git a/gswapp.make b/gswapp.make
@@ -142,9 +142,8 @@ endif
 # Internal targets
 #
 
-$(GSWAPP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
-	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-		$(SUBPROJECT_OBJ_FILES) \
+$(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
+	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
 	    $(ALL_FRAMEWORK_DIRS) $(ALL_LIB_DIRS) $(ALL_GSW_LIBS)
 
 ifeq ($(OBJC_COMPILER), NeXT)

diff --git a/gswbundle.make b/gswbundle.make
@@ -155,11 +155,10 @@ build-bundle:: $(GSWBUNDLE_FILE) \
                gswbundle-webresource-files
 
 
-$(GSWBUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) 
+$(GSWBUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
 	$(GSWBUNDLE_LD) $(GSWBUNDLE_LDFLAGS) \
 	                $(ALL_LDFLAGS) -o $(LDOUT)$(GSWBUNDLE_FILE) \
-	                $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-	                $(SUBPROJECT_OBJ_FILES) \
+			$(OBJ_FILES_TO_LINK) \
 	                $(ALL_LIB_DIRS) $(ALL_GSWBUNDLE_LIBS)
 
 gswbundle-components :: $(GSWBUNDLE_DIR_NAME)

diff --git a/library.make b/library.make
@@ -179,21 +179,18 @@ internal-library-clean::
 $(DERIVED_SOURCES):
 	$(MKDIRS) $@
 
-DLL_OFILES = $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES) \
-             $(SUBPROJECT_OBJ_FILES)
-
-$(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def: $(DLL_OFILES) $(DLL_DEF)
-	$(DLLTOOL) $(DLL_DEF_FLAG) --output-def $@ $(DLL_OFILES)
+$(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def: $(OBJ_FILES_TO_LINK) $(DLL_DEF)
+	$(DLLTOOL) $(DLL_DEF_FLAG) --output-def $@ $(OBJ_FILES_TO_LINK)
 
 $(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB): $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def
 	$(DLLTOOL) --dllname $(DLL_NAME) --def $< --output-lib $@
 
-$(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(DLL_OFILES) \
+$(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(OBJ_FILES_TO_LINK) \
                                $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def
 	$(DLLWRAP) --driver-name $(CC) \
 	  $(SHARED_LD_PREFLAGS) \
 	  --def $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def \
-	  -o $@ $(DLL_OFILES) \
+	  -o $@ $(OBJ_FILES_TO_LINK) \
 	  $(ALL_LIB_DIRS) \
 	  $(LIBRARIES_DEPEND_UPON) $(TARGET_SYSTEM_LIBS) $(SHARED_LD_POSTFLAGS) 
 
@@ -204,9 +201,7 @@ internal-library-all:: before-$(TARGET)-all \
                        $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
                        after-$(TARGET)-all
 
-$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-                                            $(OBJ_FILES) \
-                                            $(SUBPROJECT_OBJ_FILES)
+$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(OBJ_FILES_TO_LINK)
 	$(LIB_LINK_CMD)
 
 endif # BUILD_DLL

diff --git a/objc.make b/objc.make
@@ -105,9 +105,8 @@ endif
 #
 
 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_objc_program_NAME)$(EXEEXT): \
-                $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
-	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
-	      $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
+                $(OBJ_FILES_TO_LINK)
+	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
 	      $(ALL_LIB_DIRS) $(ALL_OBJC_LIBS)
 
 #

diff --git a/palette.make b/palette.make
@@ -115,10 +115,10 @@ $(PALETTE_RESOURCE_DIRS):
 
 build-palette:: $(PALETTE_FILE) palette-resource-files
 
-$(PALETTE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
+$(PALETTE_FILE) : $(OBJ_FILES_TO_LINK)
 	$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
 	  -o $(LDOUT)$(PALETTE_FILE) \
-	  $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
+	  $(OBJC_FILES_TO_LINK) \
 	  $(ALL_LIB_DIRS) $(ALL_PALETTE_LIBS)
 
 palette-resource-files:: $(PALETTE_DIR_NAME)/Resources/Info-gnustep.plist \

diff --git a/service.make b/service.make
@@ -104,9 +104,8 @@ SERVICE_RESOURCE_DIRS =  $(foreach d, $(RESOURCE_DIRS), $(SERVICE_DIR_NAME)/Reso
 SERVICE_FILE = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_service_NAME)
 
 
-$(SERVICE_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
-	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-		$(SUBPROJECT_OBJ_FILES) \
+$(SERVICE_FILE): $(OBJ_FILES_TO_LINK)
+	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
 		$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
 
 #

diff --git a/subproject.make b/subproject.make
@@ -111,8 +111,7 @@ internal-subproject-all:: before-$(TARGET)-all \
 endif
 
 # We need to depend on SUBPROJECT_OBJ_FILES to account for sub-subprojects.
-$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
-                                          $(OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
+$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(OBJ_FILES_TO_LINK)
 	$(OBJ_MERGE_CMD)
 
 before-$(TARGET)-all::

diff --git a/test-library.make b/test-library.make
@@ -119,9 +119,9 @@ before-$(TARGET)-all::
 
 after-$(TARGET)-all::
 
-$(GNUSTEP_OBJ_DIR)/$(INTERNAL_testlib_NAME): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
+$(GNUSTEP_OBJ_DIR)/$(INTERNAL_testlib_NAME): $(OBJ_FILES_TO_LINK)
 	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
-		$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
+		$(OBJ_FILES_TO_LINK) \
 		$(ALL_LIB_DIRS) $(ALL_TEST_LIBRARY_LIBS)
 
 dejagnu_vars = "FOUNDATION_LIBRARY=$(FOUNDATION_LIB)" \

diff --git a/tool.make b/tool.make
@@ -118,9 +118,9 @@ ifneq ($(FRAMEWORK_NAME),)
 internal-tool-all:: internal-install-dirs install-tool
 endif
 
-$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES)
+$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(OBJ_FILES_TO_LINK)
 	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
-		$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
+		$(OBJ_FILES_TO_LINK) \
 		$(ALL_FRAMEWORK_DIRS) $(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
 
 before-$(TARGET)-all::