ekiga r7313 - branches/gnome-2-24/win32

[mschneid svn gnome org]

Author: mschneid
Date: Thu Oct 30 19:54:30 2008
New Revision: 7313
URL: http://svn.gnome.org/viewvc/ekiga?rev=7313&view=rev

Log:
Dont strip the GTK libs since it leads to ugly exceptions in zlib.


Modified:
   branches/gnome-2-24/win32/Makefile

Modified: branches/gnome-2-24/win32/Makefile
==============================================================================
--- branches/gnome-2-24/win32/Makefile	(original)
+++ branches/gnome-2-24/win32/Makefile	Thu Oct 30 19:54:30 2008
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 SILENT := 0
-DEBUG := 1
+DEBUG := 0
 MAKEFLAGS:=
 MAKEOPTS:=$(MAKEFLAGS)
 MAKE_LIB_OPTS:=$(MAKEFLAGS)
@@ -24,7 +24,7 @@
 
 REALCC:=$(HOST_TOOL_PREFIX)-gcc
 REALCXX:=$(HOST_TOOL_PREFIX)-g++
-CONCURRENCY:=1
+CONCURRENCY:=6
 
 MACH_FLAGS:=-march=pentium-mmx
 OPTI_FLAGS:=-O3 -fomit-frame-pointer
@@ -522,12 +522,6 @@
 	-$(RM) -rf $(TARGETDIR)
 	make -C ekiga install
 	mkdir -p $(EKIGA_PREFIX)/plugins
-	unzip -u -j $(SRCDIR)/$(GTK_ARCHIVE) "bin/*.dll" -d $(EKIGA_PREFIX) ;\
-	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "etc/*" -d $(EKIGA_PREFIX) ;\
-	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "lib/*.dll" -d $(EKIGA_PREFIX) ;\
-	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "share/glib*" -d $(EKIGA_PREFIX) ; \
-	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "share/locale/*" -d $(EKIGA_PREFIX) ; \
-	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "share/themes/*" -d $(EKIGA_PREFIX) ; \
 	
 	for plugin in $(LIBDIR)/opal*/codecs/audio/*; do \
 	        install -m 755 $$plugin $(EKIGA_PREFIX)/plugins ;\
@@ -540,10 +534,19 @@
 	        install -m 755 $(BINDIR)/$$lib $(EKIGA_PREFIX) ;\
 	done
 	install -m 755  $(SIGC_DIR)/sigc++/.libs/libsigc-2.0-0.dll $(EKIGA_PREFIX)
+
 ifeq ($(DEBUG),0) 	 
 	$(STRIP) $(EKIGA_PREFIX)/*.dll
 	$(STRIP) $(EKIGA_PREFIX)/*.exe; 
 endif
+
+	unzip -u -j $(SRCDIR)/$(GTK_ARCHIVE) "bin/*.dll" -d $(EKIGA_PREFIX) ;\
+	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "etc/*" -d $(EKIGA_PREFIX) ;\
+	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "lib/*.dll" -d $(EKIGA_PREFIX) ;\
+	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "share/glib*" -d $(EKIGA_PREFIX) ; \
+	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "share/locale/*" -d $(EKIGA_PREFIX) ; \
+	unzip -u $(SRCDIR)/$(GTK_ARCHIVE) "share/themes/*" -d $(EKIGA_PREFIX) ; \
+
 	for lc in C $(DOC_LINGUAS); do \
 		mkdir -p $(EKIGA_PREFIX)/help/$$lc; \
 		if test -f $(EKIGA_DIR)/help/$$lc/ekiga.xml; then \