[Gaim-commits] SF.net SVN: gaim: [17450] trunk

[<dat...@us...>]

Revision: 17450
          http://svn.sourceforge.net/gaim/?rev=17450&view=rev
Author:   datallah
Date:     2006-10-08 10:44:10 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/config.h.mingw
    trunk/gtk/Makefile.mingw
    trunk/libgaim/Makefile.mingw

Modified: trunk/config.h.mingw
===================================================================
--- trunk/config.h.mingw	2006-10-08 09:47:23 UTC (rev 17449)
+++ trunk/config.h.mingw	2006-10-08 17:44:10 UTC (rev 17450)
@@ -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. */

Modified: trunk/gtk/Makefile.mingw
===================================================================
--- trunk/gtk/Makefile.mingw	2006-10-08 09:47:23 UTC (rev 17449)
+++ trunk/gtk/Makefile.mingw	2006-10-08 17:44:10 UTC (rev 17450)
@@ -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) \

Modified: trunk/libgaim/Makefile.mingw
===================================================================
--- trunk/libgaim/Makefile.mingw	2006-10-08 09:47:23 UTC (rev 17449)
+++ trunk/libgaim/Makefile.mingw	2006-10-08 17:44:10 UTC (rev 17450)
@@ -90,7 +90,6 @@
 		-lgmodule-2.0 \
 		-lintl \
 		-lws2_32 \
-		-liberty \
 		-lxml2
 
 include $(GAIM_COMMON_RULES)
@@ -98,18 +97,20 @@
 ##
 ## 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)
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+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
+
 ./win32/libgaimrc.rc: ./win32/libgaimrc.rc.in $(GAIM_TOP)/VERSION
 	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
 	    $@.in > $@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.