# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1160329450 0
# Node ID 85b84a253a83ed848914100928413b45adba34a0
# Parent  1136736fdd2cc5ab7f759ff4e2e0cff0dd2763e6
[gaim-migrate @ 17450]
We're not using libiberty, so don't link to it.
We don't need to define socklen_t in config.h (it is in ws2tcpip.h) (thanks nosnilmot)

committer: Tailor Script <tailor@pidgin.im>

diff -r 1136736fdd2c -r 85b84a253a83 config.h.mingw
--- a/config.h.mingw	Sun Oct 08 09:47:23 2006 +0000
+++ b/config.h.mingw	Sun Oct 08 17:44:10 2006 +0000
@@ -629,7 +629,7 @@
 /* #undef size_t */
 
 /* socklen_t size */
-#define socklen_t int
+/* #define socklen_t int */
 
 /* Define to unsigned long or unsigned long long if <stdint.h> and
    <inttypes.h> don't define. */
diff -r 1136736fdd2c -r 85b84a253a83 gtk/Makefile.mingw
--- a/gtk/Makefile.mingw	Sun Oct 08 09:47:23 2006 +0000
+++ b/gtk/Makefile.mingw	Sun Oct 08 17:44:10 2006 +0000
@@ -17,8 +17,6 @@
 EXE_NAME := $(EXE_TARGET).exe
 
 WINAPP := -mwindows
-# The Debug version of gaim is a console app, always having a console
-CONSOLEAPP := -mconsole
 
 LDFLAGS := $(WINAPP)
 
@@ -115,8 +113,7 @@
 		-lintl \
 		-lws2_32 \
 		-lwinmm \
-		-lz \
-		-liberty
+		-lz
 
 GTKGAIM_LIBS =	\
 		$(LIBGAIM_LIBS) \
diff -r 1136736fdd2c -r 85b84a253a83 libgaim/Makefile.mingw
--- a/libgaim/Makefile.mingw	Sun Oct 08 09:47:23 2006 +0000
+++ b/libgaim/Makefile.mingw	Sun Oct 08 17:44:10 2006 +0000
@@ -90,7 +90,6 @@
 		-lgmodule-2.0 \
 		-lintl \
 		-lws2_32 \
-		-liberty \
 		-lxml2
 
 include $(GAIM_COMMON_RULES)
@@ -98,17 +97,19 @@
 ##
 ## TARGET DEFINITIONS
 ##
-.PHONY: all install clean
+.PHONY: all install install_shallow clean
 
 all: $(TARGET).dll
 	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
 
-install: all $(GAIM_INSTALL_DIR)
+install_shallow: $(GAIM_INSTALL_DIR) $(TARGET).dll
+	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+
+install: install_shallow all
 	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 
 ./win32/libgaimrc.rc: ./win32/libgaimrc.rc.in $(GAIM_TOP)/VERSION
 	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \