Detect the case where logfiles but no databases are being restored.

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

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 1f85e3076a3d179df460fc54f710f8eb40d532e9..2b83bdc02b981c3ddf9ddac1745dedf64c42b0ae 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -1,33 +1,51 @@
-ECHO_CMD=
+ECHO_CMD=@
 
-DIRS=  dll \
+DIRS=  lib \
        cats \
        filed \
+       filed/plugins \
        dird \
        stored \
        console \
        wx-console \
        tools \
-       scripts \
-       installer
+       scripts
 
-.PHONY: $(DIRS) clean all
+.PHONY: $(DIRS) clean all Makefile.inc installer newinstaller
 
-all: Makefile.inc $(DIRS)
+all: Makefile.inc $(DIRS) installer newinstaller
 
-clean: $(DIRS)
+clean: $(DIRS) installer newinstaller
        $(ECHO_CMD)-rm -rf release
 
+newinstaller:
+       @if test -f Makefile.inc; then \
+          if $(MAKE) -C $@ $(MAKECMDGOALS); then \
+               echo "\n===== Make of $@ succeeded =====\n\n" ; \
+          else  \
+               echo "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+          fi ; \
+       fi
+
+installer:
+       @if test -f Makefile.inc; then \
+          if $(MAKE) -C $@ $(MAKECMDGOALS); then \
+               echo "\n===== Make of $@ succeeded =====\n\n" ; \
+          else  \
+               echo "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+          fi ; \
+       fi
+
 $(DIRS):
        @if test -f Makefile.inc; then \
           if $(MAKE) -C $@ $(MAKECMDGOALS); then \
-               echo -e "\n===== Make of $@ succeeded =====\n\n" ; \
+               echo "\n===== Make of $@ succeeded =====\n\n" ; \
           else  \
-               echo -e "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+               echo "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
           fi ; \
        fi
 
-Makefile.inc: Makefile.inc.in
+Makefile.inc:
        @echo Creating $@
        $(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \
        if test -e ../../../cross-tools/mingw32/bin/mingw32-gcc; then \
@@ -39,11 +57,16 @@ Makefile.inc: Makefile.inc.in
                INCDIR=/mingw/include; \
                DLLDIR=/mingw/bin; \
        else \
-               echo -e "\nThe GCC cross compiler isn't installed."; \
-               echo -e "You must run build-win32-cross-tools and build-dependencies first.\n"; \
+               echo "\nThe GCC cross compiler isn't installed."; \
+               echo "You must run build-win32-cross-tools and build-dependencies first.\n"; \
                exit 1; \
        fi ; \
-       sed -e "s^@TOPDIR@^$${TOPDIR}^" \
-               -e "s^@BINDIR@^$${BINDIR}^" \
-               -e "s^@INCDIR@^$${INCDIR}^" \
-               -e "s^@DLLDIR@^$${DLLDIR}^" < Makefile.inc.in > $@
+       BUILDDIR=`(pwd)`; \
+       MAINDIR=`(cd ../..;pwd)`; \
+       sed \
+               -e "s^@WIN32BUILDDIR@^$${BUILDDIR}^" \
+               -e "s^@WIN32MAINDIR@^$${MAINDIR}^" \
+               -e "s^@WIN32TOPDIR@^$${TOPDIR}^" \
+               -e "s^@WIN32BINDIR@^$${BINDIR}^" \
+               -e "s^@WIN32INCDIR@^$${INCDIR}^" \
+               -e "s^@WIN32DLLDIR@^$${DLLDIR}^" < Makefile.inc.in > $@