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 1762c8f895c7f5928675f2dd05cc702758ba0948..2b83bdc02b981c3ddf9ddac1745dedf64c42b0ae 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -1,6 +1,6 @@
-c+ECHO_CMD=@
+ECHO_CMD=@
 
-DIRS=  dll \
+DIRS=  lib \
        cats \
        filed \
        filed/plugins \
@@ -9,16 +9,33 @@ DIRS= dll \
        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 \
@@ -28,7 +45,7 @@ $(DIRS):
           fi ; \
        fi
 
-Makefile.inc: Makefile.inc.in Makefile
+Makefile.inc:
        @echo Creating $@
        $(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \
        if test -e ../../../cross-tools/mingw32/bin/mingw32-gcc; then \
@@ -44,8 +61,8 @@ Makefile.inc: Makefile.inc.in Makefile
                echo "You must run build-win32-cross-tools and build-dependencies first.\n"; \
                exit 1; \
        fi ; \
-       $(ECHO_CMD)BUILDDIR=`(pwd)`; \
-       $(ECHO_CMD)MAINDIR=`(cd ../..;pwd)`; \
+       BUILDDIR=`(pwd)`; \
+       MAINDIR=`(cd ../..;pwd)`; \
        sed \
                -e "s^@WIN32BUILDDIR@^$${BUILDDIR}^" \
                -e "s^@WIN32MAINDIR@^$${MAINDIR}^" \