2005-06-03  Adam Fedor  <fedor@gnu.org>

	* Instance/application.make (ALL_GUI_LIBS): Remove OBJC_LIBS,
	AUXILIARY_OBJC_LIBS, and TARGET_SYSTEM_LIBS
	* Instance/gswapp.make (ALL_GSW_LIBS): Idem.
	* Instance/service.make (ALL_SERVICE_LIBS): Idem.
	* Instance/tool.make (ALL_TOOL_LIBS): Idem.
	Fixes bug #9920.

Index: Instance/application.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/application.make,v
retrieving revision 1.39
diff -u -r1.39 application.make
--- Instance/application.make	22 May 2005 03:20:14 -0000	1.39
+++ Instance/application.make	4 Jun 2005 02:16:55 -0000
@@ -58,13 +58,17 @@
   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) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
-     $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)				     \
+     $(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(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.24
diff -u -r1.24 gswapp.make
--- Instance/gswapp.make	22 May 2005 03:20:14 -0000	1.24
+++ Instance/gswapp.make	4 Jun 2005 02:16:55 -0000
@@ -73,14 +73,18 @@
   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) $(AUXILIARY_OBJC_LIBS)	\
-        $(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)		\
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(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.20
diff -u -r1.20 service.make
--- Instance/service.make	22 May 2005 03:20:14 -0000	1.20
+++ Instance/service.make	4 Jun 2005 02:16:55 -0000
@@ -39,14 +39,19 @@
         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) $(AUXILIARY_OBJC_LIBS)	\
-	$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)		\
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS)            \
+	$(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.19
diff -u -r1.19 tool.make
--- Instance/tool.make	22 May 2005 03:20:14 -0000	1.19
+++ Instance/tool.make	4 Jun 2005 02:16:56 -0000
@@ -52,12 +52,16 @@
   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) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS)	\
-       $(TARGET_SYSTEM_LIBS)						\
+	$(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS)			\
 	debug=$(debug) profile=$(profile) shared=$(shared)		\
 	libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))