From: Tobias Ulmer Date: Thu, 7 Feb 2013 16:36:36 +0000 (+0100) Subject: Repair error propagation from sub-makes X-Git-Tag: e2factory-2.3.13rc1~20 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=460cf7e7b8085a1172728c345744923dc3f24559;p=e2factory.git Repair error propagation from sub-makes Signed-off-by: Tobias Ulmer --- diff --git a/Makefile b/Makefile index 922dc13..3949ef2 100644 --- 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 3230a14..bbf9b19 100644 --- 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 039e7e5..7d19c03 100644 --- 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 2a1738e..c5d8769 100644 --- 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 e191ec0..67fafd9 100644 --- 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 8dd857c..d64d1e5 100644 --- 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 95c2e1c..cd019ac 100644 --- 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 25f6ba3..5ad26a4 100644 --- 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 e6384d4..d215d30 100644 --- 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 125ba4d..3ee7c07 100644 --- 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