[Bacula-commits] bacula/src/win32/installer Makefile,1.1,1.2

[Robert N. <rob...@us...>]

Update of /cvsroot/bacula/bacula/src/win32/installer
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22578

Modified Files:
	Makefile 
Log Message:
Don't strip libmysql.dll

Index: Makefile
===================================================================
RCS file: /cvsroot/bacula/bacula/src/win32/installer/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	1 Aug 2006 07:26:55 -0000	1.1
+++ Makefile	3 Aug 2006 14:56:59 -0000	1.2
@@ -11,9 +11,7 @@
 
 DEFINES := \
 	-DVERSION=$(VERSION) \
-	-DBINDIR=$(BINDIR) \
 	-DDOCDIR=$(DOCDIR) \
-	-DDEPKGS=$(DEPKGS) \
 	-DMINGW_BIN=$(MINGW_BIN) 
 
 INSTALL_EXE := winbacula-$(VERSION).exe
@@ -34,7 +32,6 @@
 
 DEPKGS_BINARIES := \
 	libeay32.dll \
-	libmysql.dll \
 	pthreadGCE.dll \
 	ssleay32.dll \
 	zlib1.dll \
@@ -47,6 +44,9 @@
 	wxbase26_gcc_bacula.dll \
 	wxmsw26_core_gcc_bacula.dll
 
+NONGCC_BINARIES := \
+	libmysql.dll
+
 SCRIPTS := \
 	../scripts/mtx-changer.cmd.in \
 	../cats/create_mysql_database.cmd \
@@ -74,7 +74,7 @@
 
 clean:
 	@echo "Cleaning `pwd`"
-	$(CMD_ECHO)-rm -f $(INSTALL_EXE) $(BACULA_BINARIES) $(DEPKGS_BINARIES)
+	$(CMD_ECHO)-rm -f $(INSTALL_EXE) $(BACULA_BINARIES) $(DEPKGS_BINARIES) $(NONGCC_BINARIES)
 	$(CMD_ECHO)-rm -f $(BACULA_BINARIES) $(addsuffix .dbg,$(basename $(BACULA_BINARIES)))
 	$(CMD_ECHO)-rm -f $(DEPKGS_BINARIES) $(addsuffix .dbg,$(basename $(DEPKGS_BINARIES)))
 
@@ -88,11 +88,18 @@
 	$$(call makedbg,$$@)
 endef
 
+define Copy_Binary
+$$(notdir $(1)): $(1)
+	$(ECHO_CMD)cp -f $$^ $$@
+endef
+
 $(foreach file,$(addprefix $(DEPKGS)/bin/, $(DEPKGS_BINARIES)),$(eval $(call Strip_Binary,$(file))))
 
+$(foreach file,$(addprefix $(DEPKGS)/bin/, $(NONGCC_BINARIES)),$(eval $(call Copy_Binary,$(file))))
+
 $(foreach file,$(addprefix $(BINDIR)/, $(BACULA_BINARIES)),$(eval $(call Strip_Binary,$(file))))
 
-$(INSTALL_EXE): winbacula.nsi $(BACULA_BINARIES) $(SCRIPTS) $(DEPKGS_BINARIES)
+$(INSTALL_EXE): winbacula.nsi $(BACULA_BINARIES) $(SCRIPTS) $(DEPKGS_BINARIES) $(NONGCC_BINARIES)
 	NSISDIR=$(NSIS_DIR) \
 	$(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi