Makefiles: stop build process at the error

set -e is no longer necessary since we pass it to SHELL directly.

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

diff --git a/Makefile b/Makefile
index b523e8f35256d75a25e3989f1c5d5903919269ff..2e6fa18ff0f9c8027e04148db2362fbc9f087ea9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@
 #
 
 SUBDIRS    = lua generic global local plugins doc templates extensions
-TOPLEVEL    = .
+TOPLEVEL = .
 
 include $(TOPLEVEL)/make.vars
 
@@ -59,17 +59,17 @@ buildconfig.lua: Makefile make.vars
        echo 'buildconfig.VERSION="$(VERSION)"' >>$@
        echo 'buildconfig.VERSIONSTRING="$(VERSIONSTRING)"' >>$@
        echo 'buildconfig.GLOBAL_INTERFACE_VERSION={' >>$@
-       set -e; for x in $(GLOBAL_INTERFACE_VERSION) ; do \
+       for x in $(GLOBAL_INTERFACE_VERSION) ; do \
                echo " \"$$x\"," ; done >>$@
        echo '}' >>$@
        echo 'buildconfig.SYNTAX={' >>$@
-       set -e; for x in $(SYNTAX) ; do echo " \"$$x\"," ; done >>$@
+       for x in $(SYNTAX) ; do echo " \"$$x\"," ; done >>$@
        echo '}' >>$@
        echo 'return strict.lock(buildconfig)' >>$@
 
 
 all: buildconfig.lua
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        #$(MAKE) -C lua
@@ -82,7 +82,7 @@ all: buildconfig.lua
 install: all
        install -d $(DESTDIR)$(LIBDIR)
        install -m 644 buildconfig.lua $(DESTDIR)$(LIBDIR)
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        #$(MAKE) -C global install
@@ -94,7 +94,7 @@ install: all
        #$(MAKE) -C extensions install
 
 uninstall:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -f $(DESTDIR)$(LIBDIR)/buildconfig.lua
@@ -108,7 +108,7 @@ uninstall:
        #rmdir -p $(DESTDIR)$(BINDIR) >/dev/null 2>&1 || :
 
 local: buildconfig.lua
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
@@ -129,25 +129,25 @@ install-local: local
        #$(MAKE) -C doc install-local
        install -d $(LOCALLIBDIR)
        install -m 644 buildconfig.lua $(LOCALLIBDIR)
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
        install -d -m 755 $(DESTDIR)$(DOCDIR)
        install -m 644 Changelog $(DESTDIR)$(DOCDIR)/
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean:
        rm -f $(CLEAN_FILES)
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/doc/Makefile b/doc/Makefile
index c981c188290eb3a196a78c18938aec866fd77561..71b0864d17885f70084c620624e49f878ab68601 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -26,7 +26,7 @@
 #
 
 SUBDIRS    = ldoc developer man
-TOPLEVEL   = ..
+TOPLEVEL = ..
 
 include $(TOPLEVEL)/make.vars
 
@@ -36,32 +36,32 @@ CLEAN_FILES = documentation.tar.gz
        doc
 
 all:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 local:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-local:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        $(MAKE) documentation.tar.gz
@@ -76,12 +76,12 @@ documentation.tar.gz: developer/e2factory.tar.gz \
        tar -czf documentation.tar.gz documentation
 
 install-doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -fr documentation

diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index bfdf9e84b83b61804353a15b7e84cd8191424f6f..e30b262b8d8da8e9af8b876fa70ea882dc6a5bcb 100644 (file)
--- a/doc/developer/Makefile
+++ b/doc/developer/Makefile
@@ -26,7 +26,7 @@
 #
 
 SUBDIRS    =
-TOPLEVEL   = ../..
+TOPLEVEL = ../..
 
 LDOC   = $(TOPLEVEL)/doc/ldoc/ldoc
 
@@ -38,42 +38,42 @@ CLEAN_FILES = e2factory.tar.gz
        doc
 
 all:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 local:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-local:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc: gen-doc
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean: clean-doc
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -f $(CLEAN_FILES)

diff --git a/doc/ldoc/Makefile b/doc/ldoc/Makefile
index a5b3209d080ee87fb4880f7a34759f97a209d2a5..c0c6378e5219bb691a5a4baeb5cdc460b95d299c 100644 (file)
--- a/doc/ldoc/Makefile
+++ b/doc/ldoc/Makefile
@@ -8,42 +8,42 @@ CLEAN_FILES = ldoc
 .PHONY: all install install-local clean local uninstall doc install-doc
 
 all: ldoc
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 local:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-local:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 clean: clean-lua-5.1.3 clean-luafilesystem-1.6.2
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
        rm -f $(CLEAN_FILES)

diff --git a/doc/man/Makefile b/doc/man/Makefile
index fa399b54faafa1b3031a191b28603c76a6a6e135..e9846d3fa0f76a978892c6e803d62e3486a1a9bc 100644 (file)
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -70,9 +70,9 @@ install: $(MANPAGES)
        install -m644 $(MANPAGES5) $(DESTDIR)$(MANDIR)/man5
 
 uninstall:
-       set -e; for x in $(MANPAGES1) ; \
+       for x in $(MANPAGES1) ; \
                do rm -f $(DESTDIR)$(MANDIR)/man1/$$x ; done
-       set -e; for x in $(MANPAGES5) ; \
+       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 d64d1e58c6e0d5cf5b6411f22723c8adc70ad4d3..1714e5581b4c8f0b13b57f06e6c1cb228870e5a5 100644 (file)
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -25,37 +25,40 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SUBDIRS    = $(shell ls | grep -v Makefile)
-TOPLEVEL   = ..
+SUBDIRS = $(shell find . -mindepth 1 -maxdepth 1 -type d)
+TOPLEVEL = $(shell pwd)/..
+
+# extensions need a way to locate the source
+export TOPLEVEL
 
 include $(TOPLEVEL)/make.vars
-export SRC = $(shell pwd)/$(TOPLEVEL)
 
 CLEAN_FILES = *~
 
 all:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS); do $(MAKE) -C $$s $@; done
 
 install:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS); do $(MAKE) -C $$s $@; done
 
 uninstall:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS); do $(MAKE) -C $$s $@; done
 
 local:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS); do $(MAKE) -C $$s $@; done
 
 install-local:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@; done
 
 doc:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS); do $(MAKE) -C $$s $@; done
 
 install-doc:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       for s in $(SUBDIRS); do $(MAKE) -C $$s $@; done
 
 clean:
-       set -e; for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done
+       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 cfcdd39d16bc448019570f74d6e680e05b31b7e4..8d69a04850fdd194b03372cd8e3df9d7d1531529 100644 (file)
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -53,7 +53,7 @@ install: all
        install -m 644 $(SO_LIBS) $(DESTDIR)$(LIBDIR)
 
 uninstall:
-       set -e; for f in $(LUA_LIBS) $(SO_LIBS); do \
+       for f in $(LUA_LIBS) $(SO_LIBS); do \
                rm -f "$(DESTDIR)$(LIBDIR)/$$f"; \
        done
        rmdir -p $(DESTDIR)$(LIBDIR) || true
@@ -66,7 +66,7 @@ install-local: local
        install -m 644 $(SO_LIBS) $(LOCALLIBDIR)
 
 uninstall-local:
-       set -e; for f in $(LUA_LIBS) $(SO_LIBS); do \
+       for f in $(LUA_LIBS) $(SO_LIBS); do \
                rm -f "$(LOCALLIBDIR)/$$f"; \
        done
        rmdir -p $(LOCALLIBDIR) || true

diff --git a/global/Makefile b/global/Makefile
index c1b3aea3bff5882243649d4ad41e582043b3e0fb..9cb9f9dffd8f1b2caa8c1e1ac86478c12fd8601a 100644 (file)
--- a/global/Makefile
+++ b/global/Makefile
@@ -54,11 +54,11 @@ install-dirs:
 
 
 install: all install-dirs
-       set -e; for i in $(GLOBALLUATOOLS) ; do \
+       for i in $(GLOBALLUATOOLS) ; do \
                install -m 755 $$i.lua $(DESTDIR)$(TOOLDIR)/$$i ; \
                ln -sf e2 $(DESTDIR)$(BINDIR)/$$i ; \
        done
-       set -e; for i in $(GLOBALSHTOOLS) ; do \
+       for i in $(GLOBALSHTOOLS) ; do \
                install -m 755 $$i.sh $(DESTDIR)$(BINDIR)/$$i ; \
        done
        install -m 755 e2 $(DESTDIR)$(BINDIR)/
@@ -70,11 +70,11 @@ install: all install-dirs
                $(DESTDIR)$(BINDIR)/
 
 uninstall:
-       set -e; for i in $(GLOBALLUATOOLS) ; do \
+       for i in $(GLOBALLUATOOLS) ; do \
                rm -f $(DESTDIR)$(TOOLDIR)/$$i ; \
                rm -f $(DESTDIR)$(BINDIR)/$$i ; \
        done
-       set -e; for i in $(GLOBALSHTOOLS) ; do \
+       for i in $(GLOBALSHTOOLS) ; do \
                rm -f $(DESTDIR)$(BINDIR)/$$i ; \
        done
        rm -f $(DESTDIR)$(BINDIR)/e2-su-2.2
@@ -91,12 +91,12 @@ uninstall-local:
        rmdir -p $(LOCALMAKDIR) || true
 
 doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 

diff --git a/local/Makefile b/local/Makefile
index cd0363c24d73b017ca14bca1d8499ebfc17c1104..629fdb81a6b7ab1734ce06f3a06c758f91738fec 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -50,7 +50,7 @@ LOCALTOOLS = $(LOCALLUATOOLS)
 all:
 
 install:
-       set -e; for i in $(LOCALTOOLS); do \
+       for i in $(LOCALTOOLS); do \
                ln -sf e2 $(DESTDIR)$(BINDIR)/$$i ; \
        done
 
@@ -63,7 +63,7 @@ install-local: local
        install -d $(LOCALMAKDIR)
        install -d $(LOCALLIBDIR)
        install -m 644 $(LOCALLUALIBS) $(LOCALLIBDIR)
-       set -e; for i in $(LOCALLUATOOLS); do \
+       for i in $(LOCALLUATOOLS); do \
                install -m 755 $$i.lua $(LOCALBINDIR)/$$i; \
        done
        install -m755 linux32 $(LOCALBINDIR)/e2-linux32; \
@@ -72,17 +72,17 @@ install-local: local
        $(MAKE) -C make install-local
 
 doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 install-doc:
-       set -e; for s in $(SUBDIRS) ; do \
+       for s in $(SUBDIRS) ; do \
                $(MAKE) -C $$s $@ ;\
        done
 
 uninstall:
-       set -e; for i in $(LOCALTOOLS); do \
+       for i in $(LOCALTOOLS); do \
                rm -f $(DESTDIR)$(BINDIR)/e2-$$i ; \
        done
 

diff --git a/lua/Makefile b/lua/Makefile
index 65754408927e8aec0e236f067b026cc8b6e80313..2b318b26ae31f3480fc6b3cb2b74757e3ee58c0d 100644 (file)
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -57,7 +57,7 @@ uninstall:
        rm -f $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3
        rm -f $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3
        rmdir -p $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3 || true
-       set -e; for x in $(LUA_HEADER) ; do \
+       for x in $(LUA_HEADER) ; do \
                rm -f $(DESTDIR)$(INCDIR)/lua-5.1.3/$$x ; \
        done
        rmdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3 || true

diff --git a/make.vars b/make.vars
index aa295efaccec2e51d37bfe62c32a19034a251398..9d06011e4fe83d770a6824190bc58e5f70651b90 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -1,5 +1,9 @@
 # make.vars                                            -*- makefile -*-
 
+# Older (3.81) GNU Make versions don't support .POSIX or .SHELLFLAGS
+# Without this, recursive make will not "trickle down" errors.
+SHELL = /bin/sh -e
+
 # version string
 NAME = e2factory
 MAJOR = 2

diff --git a/plugins/Makefile b/plugins/Makefile
index 1810c921b53b2db9dbb20c98ae8e0c32e32245ef..a635e8e3f90c5258faf02d3f8428589fc137c941 100644 (file)
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -43,7 +43,7 @@ install:
 
 install-local:
        install -m 755 -d $(LOCALPLUGINDIR)
-       set -e; for p in $(LOCALPLUGINS) ; do \
+       for p in $(LOCALPLUGINS) ; do \
                install -m 644 $$p $(LOCALPLUGINDIR)/$$p; \
        done