# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1158262666 0
# Node ID 12cb76aeb21cbc21c548b2a9e1ae1858f2786b54
# Parent  516ef76d643022efd50867f02bcb0dca5cd311f2
[gaim-migrate @ 17278]
Allow `make -f Makefile.mingw` to work directly from the prpl directories.

committer: Tailor Script <tailor@pidgin.im>

diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/bonjour/Makefile.mingw
--- a/libgaim/protocols/bonjour/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/bonjour/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -9,6 +9,7 @@
 
 TARGET = libbonjour
 NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -79,7 +80,7 @@
 ##
 
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/gg/Makefile.mingw
--- a/libgaim/protocols/gg/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/gg/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -9,6 +9,7 @@
 
 TARGET = libgg
 CFLAGS += -include win32dep.h
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -59,8 +60,6 @@
 ##
 LIBS =	\
 			-lglib-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
 			-lintl \
 			-lgaim \
 			-lws2_32
@@ -86,7 +85,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/irc/Makefile.mingw
--- a/libgaim/protocols/irc/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/irc/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libirc
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -49,7 +50,6 @@
 ##
 LIBS =	\
 			-lglib-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -79,7 +79,7 @@
 ##
 
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/jabber/Makefile.mingw
--- a/libgaim/protocols/jabber/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/jabber/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libjabber
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -88,7 +89,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/msn/Makefile.mingw
--- a/libgaim/protocols/msn/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/msn/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,8 +8,9 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libmsn
+TYPE = PLUGIN
 
-# Static or Plugin... 
+# Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
   DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
@@ -98,7 +99,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/novell/Makefile.mingw
--- a/libgaim/protocols/novell/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/novell/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libnovell
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -81,7 +82,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/oscar/Makefile.mingw
--- a/libgaim/protocols/oscar/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/oscar/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = liboscar
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -104,7 +105,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/sametime/Makefile.mingw
--- a/libgaim/protocols/sametime/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/sametime/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -9,6 +9,7 @@
 
 TARGET = libsametime
 NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -76,7 +77,7 @@
 ##
 
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/silc/Makefile.mingw
--- a/libgaim/protocols/silc/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/silc/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -10,6 +10,7 @@
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
 			$(SILC_TOOLKIT)/lib/silcclient.dll
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -84,7 +85,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/simple/Makefile.mingw
--- a/libgaim/protocols/simple/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/simple/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libsimple
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -46,7 +47,6 @@
 ##
 LIBS =	\
 			-lglib-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -72,7 +72,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/toc/Makefile.mingw
--- a/libgaim/protocols/toc/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/toc/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libtoc
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -71,7 +72,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/yahoo/Makefile.mingw
--- a/libgaim/protocols/yahoo/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/yahoo/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libyahoo
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -56,7 +57,6 @@
 ##
 LIBS =			\
 			-lglib-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -83,7 +83,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)
diff -r 516ef76d6430 -r 12cb76aeb21c libgaim/protocols/zephyr/Makefile.mingw
--- a/libgaim/protocols/zephyr/Makefile.mingw	Thu Sep 14 19:26:04 2006 +0000
+++ b/libgaim/protocols/zephyr/Makefile.mingw	Thu Sep 14 19:37:46 2006 +0000
@@ -11,6 +11,7 @@
 KRB4_TOP := $(WIN32_DEV_TOP)/kfw-2.6.3-final.fixed
 USE_KRB4 := false
 DEFINES += -DWIN32 -DKRB5_SYSTYPES__
+TYPE = PLUGIN
 
 ifeq ($(USE_KRB4),true)
   DEFINES += -DZEPHYR_USES_KERBEROS
@@ -142,7 +143,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)