Index: Instance/application.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/application.make,v
retrieving revision 1.40
diff -u -r1.40 application.make
--- Instance/application.make	7 Jun 2005 04:21:02 -0000	1.40
+++ Instance/application.make	14 Sep 2005 03:05:11 -0000
@@ -58,17 +58,13 @@
   APP_INSTALL_DIR = $(GNUSTEP_APPS)
 endif
 
-# On windows, this is unfortunately required.
-ifeq ($(BUILD_DLL), yes)
-  DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) 
-endif
-
 ALL_GUI_LIBS =								     \
     $(shell $(WHICH_LIB_SCRIPT)						     \
      $(ALL_LIB_DIRS)							     \
      $(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) $(GUI_LIBS)		     \
      $(BACKEND_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS)	     \
-     $(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(SYSTEM_LIBS)     \
+     $(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
+     $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)				     \
         debug=$(debug) profile=$(profile) shared=$(shared)		     \
 	libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
 
Index: Instance/gswapp.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/gswapp.make,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Instance/gswapp.make	7 Jun 2005 04:21:02 -0000	1.25
+++ Instance/gswapp.make	8 Aug 2005 15:04:07 -0000	1.26
@@ -73,18 +73,14 @@
   GSWAPP_INSTALL_DIR = $(GNUSTEP_GSWAPPS)
 endif
 
-# On windows, this is unfortunately required.
-ifeq ($(BUILD_DLL), yes)
-  DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) 
-endif
-
 # Libraries that go before the WO libraries
 ALL_GSW_LIBS =								\
     $(shell $(WHICH_LIB_SCRIPT)						\
 	$(ALL_LIB_DIRS)							\
 	$(ADDITIONAL_GSW_LIBS) $(AUXILIARY_GSW_LIBS) $(GSW_LIBS)	\
 	$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS)			\
-	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(SYSTEM_LIBS) \
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS)	\
+        $(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)		\
 	debug=$(debug) profile=$(profile) shared=$(shared)		\
 	libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
 
Index: Instance/service.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/service.make,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Instance/service.make	7 Jun 2005 04:21:02 -0000	1.21
+++ Instance/service.make	8 Aug 2005 15:04:07 -0000	1.22
@@ -39,19 +39,14 @@
         internal-service-copy_into_dir \
         service-resource-files
 
-# On windows, this is unfortunately required.
-ifeq ($(BUILD_DLL), yes)
-  DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) 
-endif
-
 # Libraries that go before the GUI libraries
 ALL_SERVICE_LIBS =							\
     $(shell $(WHICH_LIB_SCRIPT)						\
 	$(ALL_LIB_DIRS)							\
 	$(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS)			\
 	$(GUI_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS)	\
-	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS)            \
-	$(SYSTEM_LIBS) 	    	                                        \
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS)	\
+	$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)		\
 	debug=$(debug) profile=$(profile) shared=$(shared)		\
 	libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
 
Index: Instance/tool.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/tool.make,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Instance/tool.make	7 Jun 2005 04:21:02 -0000	1.20
+++ Instance/tool.make	8 Aug 2005 15:04:07 -0000	1.21
@@ -52,16 +52,12 @@
   FINAL_TOOL_INSTALL_DIR = $(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
 endif
 
-# On windows, this is unfortunately required.
-ifeq ($(BUILD_DLL), yes)
-  DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) 
-endif
-
 ALL_TOOL_LIBS =								\
     $(shell $(WHICH_LIB_SCRIPT)						\
        $(ALL_LIB_DIRS)							\
        $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS)	\
-	$(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS)			\
+       $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS)	\
+       $(TARGET_SYSTEM_LIBS)						\
 	debug=$(debug) profile=$(profile) shared=$(shared)		\
 	libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))