Mercurial > pidgin3 / file diff

--- a/libgaim/protocols/Makefile.mingw	Wed Aug 23 18:50:46 2006 +0000
+++ b/libgaim/protocols/Makefile.mingw	Wed Aug 23 21:34:43 2006 +0000
@@ -5,74 +5,70 @@
 # Description: Top Makefile for win32 (mingw) port of Gaim
 #
 
-GAIM_TOP = ../..
-LIBGAIM_TOP = ../
-GAIM_PROTOS = .
-GAIM_INSTALL_DIR = $(GAIM_TOP)/win32-install-dir
+GAIM_TOP := ../..
+include $(GAIM_TOP)/libgaim/win32/global.mak
 
-OSCAR = $(GAIM_PROTOS)/oscar
-YAHOO = $(GAIM_PROTOS)/yahoo
-MSN = $(GAIM_PROTOS)/msn
-TOC = $(GAIM_PROTOS)/toc
-IRC = $(GAIM_PROTOS)/irc
-JABBER = $(GAIM_PROTOS)/jabber
-GG = $(GAIM_PROTOS)/gg
-NOVELL = $(GAIM_PROTOS)/novell
-SILC = $(GAIM_PROTOS)/silc
-SIMPLE = $(GAIM_PROTOS)/simple
-SAMETIME = $(GAIM_PROTOS)/sametime
+GG = $(GAIM_PROTOS_TOP)/gg
+IRC = $(GAIM_PROTOS_TOP)/irc
+JABBER = $(GAIM_PROTOS_TOP)/jabber
+MSN = $(GAIM_PROTOS_TOP)/msn
+NOVELL = $(GAIM_PROTOS_TOP)/novell
+OSCAR = $(GAIM_PROTOS_TOP)/oscar
+SAMETIME = $(GAIM_PROTOS_TOP)/sametime
+SILC = $(GAIM_PROTOS_TOP)/silc
+SIMPLE = $(GAIM_PROTOS_TOP)/simple
+TOC = $(GAIM_PROTOS_TOP)/toc
+YAHOO = $(GAIM_PROTOS_TOP)/yahoo
 
 ##
 ## Don't forget to change STATIC_PROTO_INIT, in config.h.mingw if you
 ## change the status of a protocol (static/plugin)
 ##
 
-OSCAR_TYPE = PLUGIN
-YAHOO_TYPE = PLUGIN
-MSN_TYPE = PLUGIN
-TOC_TYPE = PLUGIN
+GG_TYPE = PLUGIN
 IRC_TYPE = PLUGIN
 JABBER_TYPE = PLUGIN
-GG_TYPE = PLUGIN
+MSN_TYPE = PLUGIN
 NOVELL_TYPE = PLUGIN
+OSCAR_TYPE = PLUGIN
+SAMETIME_TYPE = PLUGIN
 SILC_TYPE = PLUGIN
 SIMPLE_TYPE = PLUGIN
-SAMETIME_TYPE = PLUGIN
+TOC_TYPE = PLUGIN
+YAHOO_TYPE = PLUGIN
 
 all:
-	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f Makefile.mingw
-	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f Makefile.mingw
-	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw
-	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw
-	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw
-	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
-	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
-	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
-	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw
-	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
-
+	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE)
 
 install: all
-	mkdir -p $(GAIM_INSTALL_DIR)/plugins
-	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f Makefile.mingw install
-	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f Makefile.mingw install
-	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw install
-	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install
-	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install
-	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
-	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
-	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
-	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install
-	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
+	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) install
 
 clean:
-	$(MAKE) -C $(OSCAR) -f Makefile.mingw clean
-	$(MAKE) -C $(YAHOO) -f Makefile.mingw clean
-	$(MAKE) -C $(MSN) -f Makefile.mingw clean
-	$(MAKE) -C $(IRC) -f Makefile.mingw clean
-	$(MAKE) -C $(JABBER) -f Makefile.mingw clean
-	$(MAKE) -C $(GG) -f Makefile.mingw clean
-	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
-	$(MAKE) -C $(SILC) -f Makefile.mingw clean
-	$(MAKE) -C $(SIMPLE) -f Makefile.mingw clean
-	$(MAKE) -C $(SAMETIME) -f Makefile.mingw clean
+	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) clean