Fix some trivial errors and implemented the restore of IRIX xattrs.

[bacula/bacula] / bacula / src / win32 / Makefile

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 52b4c91efaf32f93a17fcb67ad737ce15de36b7f..3bea6ece63999e3b23cb2a8c65ff5ea3597abe0a 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -1,10 +1,20 @@
+#
+#  Makefile for Win32/Win64 Bacula File daemon
+#
+#  If called make win64=yes the Win64 version will be built
+#     otherwise the Win32 version will be built.
+#
+#  If called with bat=no, bat will not be built, otherwise it will be
+#     built.
+#
+
 ECHO_CMD=@
 
 WIN32_DIRS=lib filed filed/plugins console scripts
 
 WIN64_DIRS=lib filed filed/plugins console scripts
 
-ifeq ($(WIN64),yes)
+ifeq ($(win64),yes)
         DIRS=$(WIN64_DIRS)
         INSTALLER=win64_installer
         SPECIAL=bsmtp
@@ -14,12 +24,17 @@ else
         SPECIAL=bat bsmtp
 endif
 
+ifeq ($(bat),no)
+        SPECIAL=bsmtp
+endif       
+
 .PHONY: $(DIRS) clean all Makefile.inc win32_installer full_win32_installer \
         win64_installer bsmtp
 
 all: Makefile.inc $(DIRS) $(SPECIAL) $(INSTALLER)
 
 clean: $(DIRS) win32_installer win64_installer
+       $(MAKE) -C tools clean
        $(ECHO_CMD)-rm -rf release32 release64
 
 bat:
@@ -77,7 +92,7 @@ Makefile.inc:
        @echo Creating $@
        $(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \
        TOPDIR=$${DEPKGS:-$${TOPDIR}}; \
-       if test "$(WIN64)" = yes -a -e $${TOPDIR}/cross-tools/mingw-w64/bin/x86_64-pc-mingw32-gcc; then \
+       if test "$(win64)" = yes -a -e $${TOPDIR}/cross-tools/mingw-w64/bin/x86_64-pc-mingw32-gcc; then \
                BINDIR=$${TOPDIR}/cross-tools/mingw-w64/bin; \
                INCDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/include; \
                DLLDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/bin; \
@@ -97,7 +112,8 @@ Makefile.inc:
        BUILDDIR=`(pwd)`; \
        MAINDIR=`(cd ../..;pwd)`; \
        sed \
-               -e "s^@WIN64@^$${WIN64}^" \
+               -e "s^@WIN64@^$${win64}^" \
+               -e "s^@BAT@^$${bat}^" \
                -e "s^@WIN32DEPKGS@^$${DEPKGSDIR}^" \
                -e "s^@WIN32DEPKGS32@^$${DEPKGSDIR32}^" \
                -e "s^@WIN32BUILDDIR@^$${BUILDDIR}^" \