# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1176933641 0
# Node ID ff2cd3f29f9bf218c7034ee81ee1d67d6ed8b522
# Parent  3fccb0824005f83181e98781f864250b7f1f545a
Fix win32 build for Jabber/XMPP split.

diff -r 3fccb0824005 -r ff2cd3f29f9b libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw	Wed Apr 18 21:14:39 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Wed Apr 18 22:00:41 2007 +0000
@@ -8,6 +8,7 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libjabber
+XMPP_TARGET = libxmpp
 TYPE = PLUGIN
 
 # Static or Plugin...
@@ -35,7 +36,8 @@
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
-			-L$(PURPLE_TOP)
+			-L$(PURPLE_TOP) \
+			-L.
 
 ##
 ##  SOURCES, OBJECTS
@@ -59,6 +61,9 @@
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
+XMPP_C_SRC = libxmpp.c
+XMPP_OBJECTS = $(XMPP_C_SRC:%.c=%.o)
+
 ##
 ## LIBRARIES
 ##
@@ -76,21 +81,25 @@
 ##
 .PHONY: all install clean
 
-all: $(TARGET).dll
+all: $(TARGET).dll $(XMPP_TARGET).dll
 
 install: all $(DLL_INSTALL_DIR)
-	cp $(TARGET).dll $(DLL_INSTALL_DIR)
+	cp $(XMPP_TARGET).dll $(DLL_INSTALL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
 
 $(OBJECTS): $(PURPLE_CONFIG_H)
 
 $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
+
+$(XMPP_TARGET).dll: $(TARGET).dll.a $(XMPP_OBJECTS)
+	$(CC) -shared $(XMPP_OBJECTS) $(LIB_PATHS) $(LIBS) -ljabber $(DLL_LD_FLAGS) -o $(XMPP_TARGET).dll
 
 ##
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS)
-	rm -f $(TARGET).dll
+	rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
+	rm -f $(XMPP_OBJECTS) $(XMPP_TARGET).dll
 
 include $(PIDGIN_COMMON_TARGETS)
diff -r 3fccb0824005 -r ff2cd3f29f9b pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Apr 18 21:14:39 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Apr 18 22:00:41 2007 +0000
@@ -442,6 +442,11 @@
     SetOutPath "$INSTDIR"
     ; Pidgin files
     SetOverwrite on
+
+    ;Delete old liboscar and libjabber since they tend to be problematic
+    Delete "$INSTDIR\plugins\liboscar.dll"
+    Delete "$INSTDIR\plugins\libjabber.dll"
+
     File /r ..\..\..\${PIDGIN_INSTALL_DIR}\*.*
     !ifdef DEBUG
     File "${PIDGIN_INSTALLER_DEPS}\exchndl.dll"
@@ -676,7 +681,6 @@
     Delete "$INSTDIR\plugins\libgg.dll"
     Delete "$INSTDIR\plugins\libicq.dll"
     Delete "$INSTDIR\plugins\libirc.dll"
-    Delete "$INSTDIR\plugins\libjabber.dll"
     Delete "$INSTDIR\plugins\libmsn.dll"
     Delete "$INSTDIR\plugins\libnapster.dll"
     Delete "$INSTDIR\plugins\libnovell.dll"
@@ -686,6 +690,7 @@
     Delete "$INSTDIR\plugins\libsimple.dll"
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
+    Delete "$INSTDIR\plugins\libxmpp.dll"
     Delete "$INSTDIR\plugins\log_reader.dll"
     Delete "$INSTDIR\plugins\markerline.dll"
     Delete "$INSTDIR\plugins\newline.dll"
@@ -715,6 +720,7 @@
     Delete "$INSTDIR\freebl3.dll"
     Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libgtkspell.dll"
+    Delete "$INSTDIR\libjabber.dll"
     Delete "$INSTDIR\liboscar.dll"
     Delete "$INSTDIR\libpurple.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"