Repair error propagation from sub-makes

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/Makefile b/Makefile
index 922dc134da66b8c5771e9a62f72f508c4358332d..3949ef26e0f83f84b08562a1ce76d651d6c570ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,28 +40,30 @@ CLEAN_FILES = *~ buildconfig.lua
 help:
        @cat INSTALL
 
+.SILENT: buildconfig.lua
 buildconfig.lua: Makefile make.vars
-       @echo 'writing buildconfig.lua'
-       @echo 'module ("buildconfig")' > $@
-       @echo 'PREFIX="$(PREFIX)"' >>$@
-       @echo 'BINDIR="$(BINDIR)"' >>$@
-       @echo 'LIBDIR="$(LIBDIR)"' >>$@
-       @echo 'TOOLDIR="$(TOOLDIR)"' >>$@
-       @echo 'SYSCONFDIR="$(SYSCONFDIR)"' >>$@
-       @echo 'E2="$(E2)"' >>$@
-       @echo 'LUA="$(LUA)"' >>$@
-       @echo 'MAJOR="$(MAJOR)"' >>$@
-       @echo 'MINOR="$(MINOR)"' >>$@
-       @echo 'PATCHLEVEL="$(PATCHLEVEL)"' >>$@
-       @echo 'EXTRAVERSION="$(EXTRAVERSION)"' >>$@
-       @echo 'VERSION="$(VERSION)"' >>$@
-       @echo 'VERSIONSTRING="$(VERSIONSTRING)"' >>$@
-       @echo 'GLOBAL_INTERFACE_VERSION={' >>$@
-       @for x in $(GLOBAL_INTERFACE_VERSION) ; do echo " \"$$x\"," ; done >>$@
-       @echo '}' >>$@
-       @echo 'SYNTAX={' >>$@
-       @for x in $(SYNTAX) ; do echo " \"$$x\"," ; done >>$@
-       @echo '}' >>$@
+       echo 'writing buildconfig.lua'
+       echo 'module ("buildconfig")' > $@
+       echo 'PREFIX="$(PREFIX)"' >>$@
+       echo 'BINDIR="$(BINDIR)"' >>$@
+       echo 'LIBDIR="$(LIBDIR)"' >>$@
+       echo 'TOOLDIR="$(TOOLDIR)"' >>$@
+       echo 'SYSCONFDIR="$(SYSCONFDIR)"' >>$@
+       echo 'E2="$(E2)"' >>$@
+       echo 'LUA="$(LUA)"' >>$@
+       echo 'MAJOR="$(MAJOR)"' >>$@
+       echo 'MINOR="$(MINOR)"' >>$@
+       echo 'PATCHLEVEL="$(PATCHLEVEL)"' >>$@
+       echo 'EXTRAVERSION="$(EXTRAVERSION)"' >>$@
+       echo 'VERSION="$(VERSION)"' >>$@
+       echo 'VERSIONSTRING="$(VERSIONSTRING)"' >>$@
+       echo 'GLOBAL_INTERFACE_VERSION={' >>$@
+       set -e; for x in $(GLOBAL_INTERFACE_VERSION) ; do \
+               echo " \"$$x\"," ; done >>$@
+       echo '}' >>$@
+       echo 'SYNTAX={' >>$@
+       set -e; for x in $(SYNTAX) ; do echo " \"$$x\"," ; done >>$@
+       echo '}' >>$@
 
 all: e2commit buildconfig.lua
        $(MAKE) -C lua
@@ -118,22 +120,22 @@ install-local:
        $(MAKE) -C doc install-local
 
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
        install -d -m 755 $(DOCDIR)
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        install -m 644 Changelog $(DOCDIR)/
 
 clean:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
-       for s in $(LOCALSUBDIRS) ; do \
+       set -e; for s in $(LOCALSUBDIRS) ; do \
                $(MAKE) -C $$s $@ ; \
        done
        rm -f $(CLEAN_FILES)

diff --git a/doc/Makefile b/doc/Makefile
index 3230a149d46e2e9c05a08a781751634e1bcc842d..bbf9b19159803171def0571437ab55909324ede4 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -36,32 +36,32 @@ CLEAN_FILES = documentation.tar.gz
        doc
 
 all:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 local:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-local:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        $(MAKE) documentation.tar.gz
@@ -76,24 +76,24 @@ documentation.tar.gz: developer/e2factory.tar.gz \
        tar -czf documentation.tar.gz documentation
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -fr documentation
        rm -f $(CLEAN_FILES)
 
 check:
-       for s in $(SUBDIRS) do ;\
+       set -e; for s in $(SUBDIRS) do ;\
                $(MAKE) -C $$s $@ ;\
        done
 
 localdist:
-       for s in $(SUBDIRS) do ;\
+       set -e; for s in $(SUBDIRS) do ;\
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index 039e7e5d355bc44d4ee43a75e2279459bbb95120..7d19c03c7d68d43d654d9548956b435446a47029 100644 (file)
--- a/doc/developer/Makefile
+++ b/doc/developer/Makefile
@@ -38,53 +38,53 @@ CLEAN_FILES = e2factory.tar.gz
        doc
 
 all:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 local:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-local:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc: gen-doc
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean: clean-doc
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -f $(CLEAN_FILES)
 
 check:
-       for s in $(SUBDIRS) do ;\
+       set -e; for s in $(SUBDIRS) do ;\
                $(MAKE) -C $$s $@ ;\
        done
 
 localdist:
-       for s in $(SUBDIRS) do ;\
+       set -e; for s in $(SUBDIRS) do ;\
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/doc/ldoc/Makefile b/doc/ldoc/Makefile
index 2a1738e3191f3f19c9617e65727f2c6387996fdb..c5d876931519e3860bdabd2cee4595950e055078 100644 (file)
--- a/doc/ldoc/Makefile
+++ b/doc/ldoc/Makefile
@@ -9,53 +9,53 @@ CLEAN_FILES = ldoc
        localdist
 
 all: ldoc
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 local:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-local:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean: clean-lua-5.1.3 clean-luafilesystem-1.6.2
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -f $(CLEAN_FILES)
 
 check:
-       for s in $(SUBDIRS) do ;\
+       set -e; for s in $(SUBDIRS) do ;\
                $(MAKE) -C $$s $@ ;\
        done
 
 localdist:
-       for s in $(SUBDIRS) do ;\
+       set -e; for s in $(SUBDIRS) do ;\
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/doc/man/Makefile b/doc/man/Makefile
index e191ec00b13d2aa84d0834a3b2e93e816516b2d5..67fafd9c19eac92a3eb857174a319cb45502b1cb 100644 (file)
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -42,7 +42,7 @@ e2-install-e2.1 \
 e2-locate-project-root.1 \
 e2-ls-project.1 \
 e2-new-source.1 \
-e2-playground.1 
+e2-playground.1
 
 MANPAGES5 = \
 e2.conf.5 \
@@ -68,8 +68,10 @@ install: $(MANPAGES)
        install -m644 $(MANPAGES5) $(DESTDIR)$(MANDIR)/man5
 
 uninstall:
-       for x in $(MANPAGES1) ; do rm -f $(DESTDIR)$(MANDIR)/man1/$$x ; done
-       for x in $(MANPAGES5) ; do rm -f $(DESTDIR)$(MANDIR)/man5/$$x ; done
+       set -e; for x in $(MANPAGES1) ; \
+               do rm -f $(DESTDIR)$(MANDIR)/man1/$$x ; done
+       set -e; for x in $(MANPAGES5) ; \
+               do rm -f $(DESTDIR)$(MANDIR)/man5/$$x ; done
        rmdir $(DESTDIR)$(MANDIR)/man1 || :
        rmdir $(DESTDIR)$(MANDIR)/man5 || :
 

diff --git a/extensions/Makefile b/extensions/Makefile
index 8dd857cf1359636004fff999c81f071899d97cb5..d64d1e58c6e0d5cf5b6411f22723c8adc70ad4d3 100644 (file)
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -34,28 +34,28 @@ export SRC = $(shell pwd)/$(TOPLEVEL)
 CLEAN_FILES = *~
 
 all:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 install:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 uninstall:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 local:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 install-local:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 doc:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 install-doc:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
 
 clean:
-       @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
        rm -f $(CLEAN_FILES)
 
 .PHONY: all install local install-local doc install-doc clean

diff --git a/generic/Makefile b/generic/Makefile
index 95c2e1c3896e674de508ae4e2f40cfbe8f453d6b..cd019ac38aaca5c60efc0d2e0ac24840054aa965 100644 (file)
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -48,12 +48,12 @@ local:
 install-local: local
 
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/global/Makefile b/global/Makefile
index 25f6ba36229c05d0312934ecbd4c284f3743e190..5ad26a4c577c6167d84fde328077d88be19376ab 100644 (file)
--- a/global/Makefile
+++ b/global/Makefile
@@ -61,11 +61,11 @@ install-lua: $(LUA_LIBS)
        install -m 644 $^ $(DESTDIR)$(LIBDIR)
 
 install: all install-dirs install-lua
-       for i in $(GLOBALLUATOOLS) ; do \
+       set -e; for i in $(GLOBALLUATOOLS) ; do \
                install -m 755 $$i.lua $(DESTDIR)$(TOOLDIR)/$$i ; \
                ln -sf e2 $(DESTDIR)$(BINDIR)/$$i ; \
        done
-       for i in $(GLOBALSHTOOLS) ; do \
+       set -e; for i in $(GLOBALSHTOOLS) ; do \
                install -m 755 $$i.sh $(DESTDIR)$(BINDIR)/$$i ; \
        done
        install -m 755 e2 $(DESTDIR)$(BINDIR)/
@@ -80,11 +80,11 @@ install: all install-dirs install-lua
                $(DESTDIR)$(BINDIR)/
 
 uninstall:
-       for i in $(GLOBALLUATOOLS) ; do \
+       set -e; for i in $(GLOBALLUATOOLS) ; do \
                rm -f $(DESTDIR)$(TOOLDIR)/$$i ; \
                rm -f $(DESTDIR)$(BINDIR)/$$i ; \
        done
-       for i in $(GLOBALSHTOOLS) ; do \
+       set -e; for i in $(GLOBALSHTOOLS) ; do \
                rm -f $(DESTDIR)$(BINDIR)/$$i ; \
        done
        rm -f $(DESTDIR)$(BINDIR)/e2-su-2.2
@@ -93,12 +93,12 @@ uninstall:
        rm -f $(DESTDIR)$(BINDIR)/e2
 
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/local/Makefile b/local/Makefile
index e6384d4c445f86fcac23c458154396c2a10a551f..d215d301c535c2a88fd52c018c8c98c9924701f1 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -57,7 +57,7 @@ LOCALPLUGINS = cvs.lua files.lua git.lua svn.lua
 all: linux32 sha1.so luafile_ll.so e2util.so
 
 install:
-       for i in $(LOCALTOOLS); do \
+       set -e; for i in $(LOCALTOOLS); do \
                ln -sf e2 $(DESTDIR)$(BINDIR)/$$i ; \
        done
 
@@ -70,13 +70,13 @@ install-local-lua: $(LUA_LIBS)
 install-local: all install-local-dirs install-local-lua install-local-sourcefiles
        test -n "$(PROJECTDIR)"
        install -m 755 -d $(LOCALPLUGINDIR)
-       for p in $(LOCALPLUGINS) ; do \
+       set -e; for p in $(LOCALPLUGINS) ; do \
                install -m 644 $$p $(LOCALPLUGINDIR)/$$p; \
        done
-       for i in $(LOCALLUATOOLS); do \
+       set -e; for i in $(LOCALLUATOOLS); do \
                install -m 755 $$i.lua $(LOCALBINDIR)/$$i; \
        done
-       for i in $(LOCALSHTOOLS); do \
+       set -e; for i in $(LOCALSHTOOLS); do \
                install -m 755 $$i $(LOCALBINDIR)/$$i; \
        done
        install -m755 linux32 $(LOCALBINDIR)/e2-linux32; \
@@ -90,17 +90,17 @@ install-local: all install-local-dirs install-local-lua install-local-sourcefile
 install-local-sourcefiles: e2-su-2.2.c
        install -m 644 $^ $(LOCALMAKDIR)
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       for i in $(LOCALTOOLS); do \
+       set -e; for i in $(LOCALTOOLS); do \
                rm -f $(DESTDIR)$(BINDIR)/e2-$$i ; \
        done
 

diff --git a/lua/Makefile b/lua/Makefile
index 125ba4d30a7306e71dc585480762be8937ca9e85..3ee7c079ef4805954feefd7ac5dc143972ae57d8 100644 (file)
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -56,18 +56,18 @@ uninstall:
        rm -f $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3
        rm -f $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3
        rm -fr $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3
-       for x in $(LUA_HEADER) ; do \
+       set -e; for x in $(LUA_HEADER) ; do \
                rm -f $(DESTDIR)$(INCDIR)/lua-5.1.3/$$x ; \
        done
        rmdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3 || :
 
 doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       for s in $(SUBDIRS) ; do \
+       set -e; for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done