diff options
| author | Kenny Napier <kenny.napier@lexmark.com> | 2019-02-14 21:23:16 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2019-02-14 21:24:39 +0000 |
| commit | 72e45666105eaada29e622d537617c38ccb33acd (patch) | |
| tree | 899f29002316c5c1b52f19f4bdce26c3a8fc32d8 | |
| parent | edb38a968396f57478869773587eab6a26bc01cf (diff) | |
| download | dhcpcd-72e45666105eaada29e622d537617c38ccb33acd.tar.xz | |
build: exit the SUBDIR build loop if an error is detected
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/bpf.c | 1 | ||||
| -rw-r--r-- | tests/Makefile | 6 |
4 files changed, 12 insertions, 13 deletions
@@ -22,10 +22,10 @@ CLEANFILES+= *.tar.xz .SUFFIXES: .in all: config.h - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done depend: config.h - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done tests: cd $@; ${MAKE} $@ @@ -36,17 +36,17 @@ hooks: cd $@; ${MAKE} eginstall: - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done install: - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done proginstall: - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done clean: rm -rf cov-int dhcpcd.xz - for x in ${SUBDIRS} tests; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS} tests; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done distclean: clean rm -f config.h config.mk config.log \ diff --git a/src/Makefile b/src/Makefile index d7d11931..665f5ff6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -45,7 +45,7 @@ CLEANFILES+= *.tar.xz $< > $@ all: ${TOP}/config.h ${PROG} ${SCRIPTS} ${MAN5} ${MAN8} - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done dev: cd dev && ${MAKE} @@ -84,7 +84,7 @@ _proginstall: ${PROG} ${INSTALL} -d ${DESTDIR}${DBDIR} proginstall: _proginstall ${EMBEDDEDINSTALL} - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done _maninstall: ${MAN5} ${MAN8} ${INSTALL} -d ${DESTDIR}${MANDIR}/man5 @@ -130,7 +130,7 @@ install: proginstall _maninstall _confinstall eginstall clean: rm -f ${OBJS} ${PROG} ${PROG}.core ${CLEANFILES} - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done distclean: clean rm -f .depend @@ -24,7 +24,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/tests/Makefile b/tests/Makefile index 1915c32c..1ae0a8b2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,16 +1,16 @@ SUBDIRS= crypt eloop-bench all: - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done install: proginstall: clean: - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done test: - for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done + for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done tests: test |