[Gaim-commits] CVS: gaim/src/protocols/msn Makefile.mingw,1.6,1.7

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv32291/src/protocols/msn

Modified Files:
	Makefile.mingw 
Log Message:
Changed dll build rules in the mingw makefiles. Plugins will no
longer crash when built with the '-g' compile flag and plugin crashes will
now produce the correct debug info.

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/Makefile.mingw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.mingw	4 Jun 2003 16:18:15 -0000	1.6
+++ Makefile.mingw	21 Jun 2003 00:59:23 -0000	1.7
@@ -91,10 +91,14 @@
 ## LIBRARIES
 ##
 
-LIBS = -lgtk-win32-2.0 -lglib-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lgobject-2.0 -lws2_32 -lintl -lgaim
-
-# -liberty
-
+LIBS =			-lgtk-win32-2.0 \
+			-lglib-2.0 \
+			-lgdk-win32-2.0 \
+			-lgmodule-2.0 \
+			-lgobject-2.0 \
+			-lws2_32 \
+			-lintl \
+			-lgaim
 
 ##
 ## RULES
@@ -128,23 +132,8 @@
 ## BUILD DLL
 ##
 
-$(TARGET).def: $(OBJECTS)
-	dlltool --dllname $(TARGET).dll -z $(TARGET).def \
-		$(OBJECTS)
-
-$(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
-	rm -rf junk.tmp
-
-$(TARGET).exp: $(TARGET).def $(TARGET).base
-	dlltool --dllname $(TARGET).dll --base-file $(TARGET).base \
-		--output-exp $(TARGET).exp --def $(TARGET).def
-	rm -rf $(TARGET).base
-
-$(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
-	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
-	rm -rf $(TARGET).exp
+$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll
 
 
 ##
@@ -155,4 +144,3 @@
 	rm -rf *.o
 	rm -rf $(TARGET).dll
 	rm -rf $(TARGET).lib
-	rm -rf $(TARGET).def