[Gaim-commits] CVS: gaim/src/protocols/yahoo Makefile.mingw,1.1,1.2

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv8633

Modified Files:
	Makefile.mingw 
Log Message:
global.mak introduced

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/Makefile.mingw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.mingw	11 Oct 2002 03:14:01 -0000	1.1
+++ Makefile.mingw	16 Oct 2002 19:57:53 -0000	1.2
@@ -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 = -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)
@@ -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