Mercurial > pidgin.yaz
changeset 14698:85b84a253a83
[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>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 08 Oct 2006 17:44:10 +0000 |
| parents | 1136736fdd2c |
| children | cd1ddfa8868c |
| files | config.h.mingw gtk/Makefile.mingw libgaim/Makefile.mingw |
| diffstat | 3 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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. */
--- 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) \
--- 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' \