From: Paul Mackerras Date: Fri, 14 Aug 2015 10:16:16 +0000 (+1000) Subject: Merge branch 'master' of git://github.com/vapier/ppp X-Git-Tag: ppp-2.4.8~50 X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=912e4fc6665aca188dced7ea7fdc663ce5a2dd24;hp=3a5c9a8fbc8970375cd881151d44e4b6fe249c6a;p=ppp.git Merge branch 'master' of git://github.com/vapier/ppp Signed-off-by: Paul Mackerras --- diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux index ab8cf50..8a90e39 100644 --- a/pppd/plugins/Makefile.linux +++ b/pppd/plugins/Makefile.linux @@ -27,7 +27,7 @@ include .depend endif all: $(PLUGINS) - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit $$?; done %.so: %.c $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ @@ -37,12 +37,12 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) install: $(PLUGINS) $(INSTALL) -d $(LIBDIR) $(INSTALL) $? $(LIBDIR) - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $$?; done clean: rm -f *.o *.so *.a - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean || exit $$?; done depend: $(CPP) -M $(CFLAGS) *.c >.depend - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend || exit $$?; done