Mercurial > pidgin3 / file diff

--- a/libgaim/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/libgaim/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -8,13 +8,17 @@
 # PATHS
 #
 
-INCLUDE_DIR :=		.
 GTK_TOP :=		../../win32-dev/gtk_2_0
 GAIM_TOP :=		..
-GAIM_SRC :=		.
+LIBGAIM_TOP :=		.
+PLUGINS_TOP :=		$(LIBGAIM_TOP)/plugins
+PROTOCOLS_TOP :=	$(LIBGAIM_TOP)/protocols
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 LIBXML2_DIR :=		../../win32-dev/libxml2
 
+NEEDED_DLLS = $(LIBXML2_DIR)/bin/libxml2.dll
+
+
 ##
 ## VARIABLE DEFINITIONS
 ##
@@ -31,15 +35,15 @@
 ## INCLUDE  MAKEFILES
 ##
 
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(LIBGAIM_TOP)/win32/global.mak
 
 ##
 ## INCLUDE PATHS
 ##
 
 INCLUDE_PATHS =	\
-			-I$(INCLUDE_DIR) \
-			-I$(INCLUDE_DIR)/win32 \
+			-I$(LIBGAIM_TOP) \
+			-I$(LIBGAIM_TOP)/win32 \
 			-I$(GAIM_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
@@ -47,7 +51,7 @@
 			-I$(LIBXML2_DIR)/include
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_SRC) \
+			-L$(LIBGAIM_TOP) \
 			-L$(LIBXML2_DIR)/lib
 
 ##
@@ -134,11 +138,14 @@
 .PHONY: all clean include_path
 
 all: $(TARGET).dll
-	$(MAKE) -C protocols -f Makefile.mingw
+	$(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw
 
 install: all
-	$(MAKE) -C protocols -f Makefile.mingw install
-	cp $(GAIM_SRC)/$(TARGET).dll $(GAIM_INSTALL_DIR)
+	$(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw install
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw install
+	cp $(LIBGAIM_TOP)/$(TARGET).dll $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 
 #
 # BUILD DLL
@@ -155,4 +162,5 @@
 	rm -rf *.o ./win32/*.o
 	rm -rf $(TARGET).dll
 	rm -rf $(TARGET).dll.a
-	$(MAKE) -C protocols -f Makefile.mingw clean
+	$(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw clean
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw clean