# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1034798451 0
# Node ID fd3880c03f0dbad83a6dfac922aaf585d5a979c7
# Parent  988485669631fed7597e202647d5277b4775dc07
[gaim-migrate @ 3851]
global.mak introduced

committer: Tailor Script <tailor@pidgin.im>

diff -r 988485669631 -r fd3880c03f0d src/protocols/gg/Makefile.mingw
--- a/src/protocols/gg/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/gg/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -20,16 +20,11 @@
 
 TARGET = libgg
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
+CFLAGS =
 
-DEFINES = 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
-		-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -46,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -96,7 +92,7 @@
 # How to make a C file
 
 %.o: %.c
-	gcc $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
 
 ##
 ## TARGET DEFINITIONS
@@ -126,7 +122,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -136,7 +132,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 
diff -r 988485669631 -r fd3880c03f0d src/protocols/irc/Makefile.mingw
--- a/src/protocols/irc/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/irc/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -20,18 +20,11 @@
 
 TARGET = libirc
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CC = gcc
-
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
+CFLAGS =
 
-DEFINES = 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
-		-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -48,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -126,7 +120,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -136,7 +130,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 
diff -r 988485669631 -r fd3880c03f0d src/protocols/jabber/Makefile.mingw
--- a/src/protocols/jabber/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/jabber/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -20,18 +20,11 @@
 
 TARGET = libjabber
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CC = gcc
-
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
+CFLAGS =
 
-DEFINES = 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
-		-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -48,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -89,7 +83,6 @@
 		pproxy.c \
 		rate.c \
 		sha.c \
-		snprintf.c \
 		socket.c \
 		str.c \
 		xhash.c \
@@ -150,7 +143,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -160,7 +153,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 
diff -r 988485669631 -r fd3880c03f0d src/protocols/msn/Makefile.mingw
--- a/src/protocols/msn/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/msn/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -20,18 +20,11 @@
 
 TARGET = libmsn
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CC = gcc
-
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
+CFLAGS =
 
-DEFINES = 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
-		-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -48,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -126,7 +120,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -136,7 +130,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 
diff -r 988485669631 -r fd3880c03f0d src/protocols/napster/Makefile.mingw
--- a/src/protocols/napster/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/napster/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -20,18 +20,11 @@
 
 TARGET = libnapster
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CC = gcc
-
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
+CFLAGS =
 
-DEFINES = 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
-		-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -48,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -126,7 +120,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -136,7 +130,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 
diff -r 988485669631 -r fd3880c03f0d src/protocols/oscar/Makefile.mingw
--- a/src/protocols/oscar/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/oscar/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -19,19 +19,11 @@
 
 TARGET = liboscar
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CC = gcc.exe $(GCOPTS)
-
-# Only use -g flag when building STATIC version
-CFLAGS = -O2 -Wall -Werror
+CFLAGS =
 
-DEFINES = 		-DHAVE_CONFIG_H \
-			-DVERSION=\"$(VERSION)\" \
-			-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-			-DAIM_BUILDTIME=\"`date +%H%M%S`\" 
+DEFINES =
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -48,6 +40,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -152,7 +145,7 @@
 	dlltool --dllname $(TARGET).dll -z $(TARGET).def --export-all-symbols $(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -162,7 +155,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 ##
diff -r 988485669631 -r fd3880c03f0d src/protocols/toc/Makefile.mingw
--- a/src/protocols/toc/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/toc/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -20,18 +20,11 @@
 
 TARGET = libtoc
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-CC = gcc
-
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
+CFLAGS =
 
-DEFINES = 	-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-		-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-		-DVERSION=\"$(VERSION)\" \
-		-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -48,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -126,7 +120,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -136,7 +130,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp
 
 
diff -r 988485669631 -r fd3880c03f0d src/protocols/yahoo/Makefile.mingw
--- a/src/protocols/yahoo/Makefile.mingw	Wed Oct 16 19:57:03 2002 +0000
+++ b/src/protocols/yahoo/Makefile.mingw	Wed Oct 16 20:00:51 2002 +0000
@@ -8,10 +8,7 @@
 # PATHS
 #
 
-BUILD_TOOLS = /usr/local/mingw
-
 INCLUDE_DIR :=		.
-
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
 GAIM_TOP :=		../../..
 YAHOO_ROOT :=		.
@@ -23,20 +20,11 @@
 
 TARGET = libyahoo
 
-VERSION := $(shell cat $(GAIM_TOP)/VERSION)
-
 # Compiler Options
 
-GCOPTS = -B $(BUILD_TOOLS)
-
-CC = gcc.exe $(GCOPTS)
+CFLAGS =
 
-CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct
-
-DEFINES = 		-DAIM_BUILDDATE=\"`date +%Y%m%d`\" \
-			-DAIM_BUILDTIME=\"`date +%H%M%S`\" \
-			-DVERSION=\"$(VERSION)\" \
-			-DHAVE_CONFIG_H
+DEFINES =
 
 # Static or Plugin... 
 ifeq ($(TYPE),STATIC)
@@ -53,6 +41,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
+include $(GAIM_TOP)/src/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -132,7 +121,7 @@
 		$(OBJECTS)
 
 $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS)
 	rm -rf junk.tmp
 
 $(TARGET).exp: $(TARGET).def $(TARGET).base
@@ -142,7 +131,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib
 	dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).lib
-	gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
+	$(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS)
 	rm -rf $(TARGET).exp