diff src/protocols/jabber/Makefile.mingw @ 5932:bb7723f0b4b9

[gaim-migrate @ 6372] 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. committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Sat, 21 Jun 2003 01:03:23 +0000
parents fd3880c03f0d
children 15733f9cfe69
line wrap: on
line diff
--- a/src/protocols/jabber/Makefile.mingw	Sat Jun 21 01:01:12 2003 +0000
+++ b/src/protocols/jabber/Makefile.mingw	Sat Jun 21 01:03:23 2003 +0000
@@ -69,29 +69,29 @@
 ##  SOURCES, OBJECTS
 ##
 
-C_SRC =		jabber.c \
-		expat.c \
-		genhash.c \
-		hashtable.c \
-		jconn.c \
-		jid.c \
-		jpacket.c \
-		jutil.c \
-		karma.c \
-		log.c \
-		pool.c \
-		pproxy.c \
-		rate.c \
-		sha.c \
-		socket.c \
-		str.c \
-		xhash.c \
-		xmlnode.c \
-		xmlparse.c \
-		xmlrole.c \
-		xmltok.c \
-		xstream.c \
-		win32/posix.uname.c
+C_SRC =			jabber.c \
+			expat.c \
+			genhash.c \
+			hashtable.c \
+			jconn.c \
+			jid.c \
+			jpacket.c \
+			jutil.c \
+			karma.c \
+			log.c \
+			pool.c \
+			pproxy.c \
+			rate.c \
+			sha.c \
+			socket.c \
+			str.c \
+			xhash.c \
+			xmlnode.c \
+			xmlparse.c \
+			xmlrole.c \
+			xmltok.c \
+			xstream.c \
+			win32/posix.uname.c
 
 
 OBJECTS = $(C_SRC:%.c=%.o)
@@ -101,10 +101,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
@@ -138,24 +142,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
 
 ##
 ## CLEAN RULES
@@ -166,4 +154,3 @@
 	rm -rf ./win32/*.o
 	rm -rf $(TARGET).dll
 	rm -rf $(TARGET).lib
-	rm -rf $(TARGET).def