+ yet more autobuild-related updates

svn path=/trunk/externals/moocow/; revision=10603

1 files changed, 59 insertions, 53 deletions

diff --git a/extended/Makefile b/extended/Makefile
index 093e1e8..0296e30 100644
--- a/extended/Makefile
+++ b/extended/Makefile
@@ -24,7 +24,7 @@ SUBDIRS = \
 MOOCOW_DIR    ?=$(shell pwd)
 MOOCOW_BUILD  ?=$(MOOCOW_DIR)/build.moo
 MOOCOW_MFLAGS ?=DESTDIR=""
-MOOCOW_BUILD_VERSION ?=2009-01-17.002
+MOOCOW_BUILD_VERSION ?=2009-01-23.000
 
 CONFIGURE_ARGS=\
 	CFLAGS="$(CFLAGS)" \
@@ -34,11 +34,17 @@ CONFIGURE_ARGS=\
 
 #	--with-pd-extdir="$(MOOCOW_BUILD)/externs"
 
+## ONFAIL
+##  + set to 'true' to ignore failed sub-targets (for robust autobuild)
+##  + set to 'false' to turn failed builds into make errors (maintainer only)
+#ONFAIL ?= true
+#ONFAIL ?= false
+ONFAIL ?= echo "(MOOCOW) Warning: sub-target failed: '$@'"
+
 ##-- defaults
 CFLAGS ?= -g -O2 -Wall -Winline -W
 pd_src ?= $(CURDIR)/../../../pd
 
-
 ##======================================================================
 ## Rules: default
 all: build.stamp
@@ -49,28 +55,28 @@ all: build.stamp
 DUMMY_DIR            ?=../dummy
 DUMMY_CONFIGURE_ARGS ?=--disable-shared
 dummy.autogen_stamp: 
-#	(cd $(DUMMY_DIR); sh ./autogen.sh) || true
+#	(cd $(DUMMY_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 dummy.configure_stamp: dummy.autogen_stamp
-	(cd $(DUMMY_DIR); sh ./configure $(CONFIGURE_ARGS) $(DUMMY_CONFIGURE_ARGS); make clean) || true
+	(cd $(DUMMY_DIR); sh ./configure $(CONFIGURE_ARGS) $(DUMMY_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 dummy.build_stamp: dummy.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(DUMMY_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(DUMMY_DIR) all install || $(ONFAIL)
 	touch $@
 
 dummy.extclean:
 	rm -f dummy.autogen_stamp dummy.configure_stamp dummy.build_stamp
 
 dummy.clean: dummy.extclean
-	$(MAKE) -C $(DUMMY_DIR) clean || true
+	$(MAKE) -C $(DUMMY_DIR) clean || $(ONFAIL)
 
 dummy.distclean: dummy.extclean
-	$(MAKE) -C $(DUMMY_DIR) distclean || true
+	$(MAKE) -C $(DUMMY_DIR) distclean || $(ONFAIL)
 
 dummy.cvsclean: dummy.extclean
-	$(MAKE) -C $(DUMMY_DIR) cvsclean || true
+	$(MAKE) -C $(DUMMY_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: flite
@@ -80,28 +86,28 @@ FLITE_DIR            ?=../flite
 #FLITE_CONFIGURE_ARGS ?=
 
 flite.autogen_stamp: 
-#	(cd $(FLITE_DIR); sh ./autogen.sh) || true
+#	(cd $(FLITE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 flite.configure_stamp: flite.autogen_stamp
-	(cd $(FLITE_DIR); sh ./configure $(CONFIGURE_ARGS) $(FLITE_CONFIGURE_ARGS); make clean) || true
+	(cd $(FLITE_DIR); sh ./configure $(CONFIGURE_ARGS) $(FLITE_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 flite.build_stamp: flite.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(FLITE_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(FLITE_DIR) all install || $(ONFAIL)
 	touch $@
 
 flite.extclean:
 	rm -f flite.autogen_stamp flite.configure_stamp flite.build_stamp
 
 flite.clean: flite.extclean
-	$(MAKE) -C $(FLITE_DIR) clean || true
+	$(MAKE) -C $(FLITE_DIR) clean || $(ONFAIL)
 
 flite.distclean: flite.extclean
-	$(MAKE) -C $(FLITE_DIR) distclean || true
+	$(MAKE) -C $(FLITE_DIR) distclean || $(ONFAIL)
 
 flite.cvsclean: flite.extclean
-	$(MAKE) -C $(FLITE_DIR) cvsclean || true
+	$(MAKE) -C $(FLITE_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: gfsm
@@ -111,28 +117,28 @@ GFSM_DIR            ?=../gfsm
 #GFSM_CONFIGURE_ARGS ?=
 
 gfsm.autogen_stamp: 
-#	(cd $(GFSM_DIR); sh ./autogen.sh) || true
+#	(cd $(GFSM_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 gfsm.configure_stamp: gfsm.autogen_stamp
-	(cd $(GFSM_DIR); sh ./configure $(CONFIGURE_ARGS) $(GFSM_CONFIGURE_ARGS); make clean) || true
+	(cd $(GFSM_DIR); sh ./configure $(CONFIGURE_ARGS) $(GFSM_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 gfsm.build_stamp: gfsm.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(GFSM_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(GFSM_DIR) all install || $(ONFAIL)
 	touch $@
 
 gfsm.extclean:
 	rm -f gfsm.autogen_stamp gfsm.configure_stamp gfsm.build_stamp
 
 gfsm.clean: gfsm.extclean
-	$(MAKE) -C $(GFSM_DIR) clean || true
+	$(MAKE) -C $(GFSM_DIR) clean || $(ONFAIL)
 
 gfsm.distclean: gfsm.extclean
-	$(MAKE) -C $(GFSM_DIR) distclean || true
+	$(MAKE) -C $(GFSM_DIR) distclean || $(ONFAIL)
 
 gfsm.cvsclean: gfsm.extclean
-	$(MAKE) -C $(GFSM_DIR) cvsclean || true
+	$(MAKE) -C $(GFSM_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: deque
@@ -140,28 +146,28 @@ gfsm.cvsclean: gfsm.extclean
 DEQUE_DIR            ?=../deque
 DEQUE_CONFIGURE_ARGS ?=
 deque.autogen_stamp: 
-#	(cd $(DEQUE_DIR); sh ./autogen.sh) || true
+#	(cd $(DEQUE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 deque.configure_stamp: deque.autogen_stamp
-	(cd $(DEQUE_DIR); sh ./configure $(CONFIGURE_ARGS) $(DEQUE_CONFIGURE_ARGS); make clean) || true
+	(cd $(DEQUE_DIR); sh ./configure $(CONFIGURE_ARGS) $(DEQUE_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 deque.build_stamp: deque.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(DEQUE_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(DEQUE_DIR) all install || $(ONFAIL)
 	touch $@
 
 deque.extclean:
 	rm -f deque.autogen_stamp deque.configure_stamp deque.build_stamp
 
 deque.clean: deque.extclean
-	$(MAKE) -C $(DEQUE_DIR) clean || true
+	$(MAKE) -C $(DEQUE_DIR) clean || $(ONFAIL)
 
 deque.distclean: deque.extclean
-	$(MAKE) -C $(DEQUE_DIR) distclean || true
+	$(MAKE) -C $(DEQUE_DIR) distclean || $(ONFAIL)
 
 deque.cvsclean: deque.extclean
-	$(MAKE) -C $(DEQUE_DIR) cvsclean || true
+	$(MAKE) -C $(DEQUE_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: pdstring
@@ -169,28 +175,28 @@ deque.cvsclean: deque.extclean
 PDSTRING_DIR            ?=../pdstring
 PDSTRING_CONFIGURE_ARGS ?=--enable-object-externals
 pdstring.autogen_stamp: 
-#	(cd $(PDSTRING_DIR); sh ./autogen.sh) || true
+#	(cd $(PDSTRING_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 pdstring.configure_stamp: pdstring.autogen_stamp
-	(cd $(PDSTRING_DIR); sh ./configure $(CONFIGURE_ARGS) $(PDSTRING_CONFIGURE_ARGS); make clean) || true
+	(cd $(PDSTRING_DIR); sh ./configure $(CONFIGURE_ARGS) $(PDSTRING_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 pdstring.build_stamp: pdstring.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(PDSTRING_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(PDSTRING_DIR) all install || $(ONFAIL)
 	touch $@
 
 pdstring.extclean:
 	rm -f pdstring.autogen_stamp pdstring.configure_stamp pdstring.build_stamp
 
 pdstring.clean: pdstring.extclean
-	$(MAKE) -C $(PDSTRING_DIR) clean || true
+	$(MAKE) -C $(PDSTRING_DIR) clean || $(ONFAIL)
 
 pdstring.distclean: pdstring.extclean
-	$(MAKE) -C $(PDSTRING_DIR) distclean || true
+	$(MAKE) -C $(PDSTRING_DIR) distclean || $(ONFAIL)
 
 pdstring.cvsclean: pdstring.extclean
-	$(MAKE) -C $(PDSTRING_DIR) cvsclean || true
+	$(MAKE) -C $(PDSTRING_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: readdir
@@ -198,28 +204,28 @@ pdstring.cvsclean: pdstring.extclean
 READDIR_DIR            ?=../readdir
 READDIR_CONFIGURE_ARGS ?=
 readdir.autogen_stamp: 
-#	(cd $(READDIR_DIR); sh ./autogen.sh) || true
+#	(cd $(READDIR_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 readdir.configure_stamp: readdir.autogen_stamp
-	(cd $(READDIR_DIR); sh ./configure $(CONFIGURE_ARGS) $(READDIR_CONFIGURE_ARGS); make clean) || true
+	(cd $(READDIR_DIR); sh ./configure $(CONFIGURE_ARGS) $(READDIR_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 readdir.build_stamp: readdir.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(READDIR_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(READDIR_DIR) all install || $(ONFAIL)
 	touch $@
 
 readdir.extclean:
 	rm -f readdir.autogen_stamp readdir.configure_stamp readdir.build_stamp
 
 readdir.clean: readdir.extclean
-	$(MAKE) -C $(READDIR_DIR) clean || true
+	$(MAKE) -C $(READDIR_DIR) clean || $(ONFAIL)
 
 readdir.distclean: readdir.extclean
-	$(MAKE) -C $(READDIR_DIR) distclean || true
+	$(MAKE) -C $(READDIR_DIR) distclean || $(ONFAIL)
 
 readdir.cvsclean: readdir.extclean
-	$(MAKE) -C $(READDIR_DIR) cvsclean || true
+	$(MAKE) -C $(READDIR_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: sprinkler
@@ -228,28 +234,28 @@ readdir.cvsclean: readdir.extclean
 SPRINKLER_DIR            ?=../sprinkler
 SPRINKLER_CONFIGURE_ARGS ?=
 sprinkler.autogen_stamp: 
-#	(cd $(SPRINKLER_DIR); sh ./autogen.sh) || true
+#	(cd $(SPRINKLER_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 sprinkler.configure_stamp: sprinkler.autogen_stamp
-	(cd $(SPRINKLER_DIR); sh ./configure $(CONFIGURE_ARGS) $(SPRINKLER_CONFIGURE_ARGS); make clean) || true
+	(cd $(SPRINKLER_DIR); sh ./configure $(CONFIGURE_ARGS) $(SPRINKLER_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 sprinkler.build_stamp: sprinkler.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(SPRINKLER_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(SPRINKLER_DIR) all install || $(ONFAIL)
 	touch $@
 
 sprinkler.extclean:
 	rm -f sprinkler.autogen_stamp sprinkler.configure_stamp sprinkler.build_stamp
 
 sprinkler.clean: sprinkler.extclean
-	$(MAKE) -C $(SPRINKLER_DIR) clean || true
+	$(MAKE) -C $(SPRINKLER_DIR) clean || $(ONFAIL)
 
 sprinkler.distclean: sprinkler.extclean
-	$(MAKE) -C $(SPRINKLER_DIR) distclean || true
+	$(MAKE) -C $(SPRINKLER_DIR) distclean || $(ONFAIL)
 
 sprinkler.cvsclean: sprinkler.extclean
-	$(MAKE) -C $(SPRINKLER_DIR) cvsclean || true
+	$(MAKE) -C $(SPRINKLER_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: weightmap
@@ -257,28 +263,28 @@ sprinkler.cvsclean: sprinkler.extclean
 WEIGHTMAP_DIR            ?=../weightmap
 WEIGHTMAP_CONFIGURE_ARGS ?=
 weightmap.autogen_stamp: 
-#	(cd $(WEIGHTMAP_DIR); sh ./autogen.sh) || true
+#	(cd $(WEIGHTMAP_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 weightmap.configure_stamp: weightmap.autogen_stamp
-	(cd $(WEIGHTMAP_DIR); sh ./configure $(CONFIGURE_ARGS) $(WEIGHTMAP_CONFIGURE_ARGS); make clean) || true
+	(cd $(WEIGHTMAP_DIR); sh ./configure $(CONFIGURE_ARGS) $(WEIGHTMAP_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 weightmap.build_stamp: weightmap.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(WEIGHTMAP_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(WEIGHTMAP_DIR) all install || $(ONFAIL)
 	touch $@
 
 weightmap.extclean:
 	rm -f weightmap.autogen_stamp weightmap.configure_stamp weightmap.build_stamp
 
 weightmap.clean: weightmap.extclean
-	$(MAKE) -C $(WEIGHTMAP_DIR) clean || true
+	$(MAKE) -C $(WEIGHTMAP_DIR) clean || $(ONFAIL)
 
 weightmap.distclean: weightmap.extclean
-	$(MAKE) -C $(WEIGHTMAP_DIR) distclean || true
+	$(MAKE) -C $(WEIGHTMAP_DIR) distclean || $(ONFAIL)
 
 weightmap.cvsclean: weightmap.extclean
-	$(MAKE) -C $(WEIGHTMAP_DIR) cvsclean || true
+	$(MAKE) -C $(WEIGHTMAP_DIR) cvsclean || $(ONFAIL)
 
 
 ##======================================================================
@@ -298,11 +304,11 @@ README.txt: README.pod
 	pod2text README.pod $@
 
 extclean: $(SUBDIRS:=.extclean)
-
-clean: $(SUBDIRS:=.clean)
-	rm  -f build.stamp config.log
+	rm -f build.stamp config.log
 	rm -rf $(MOOCOW_BUILD)
 
+clean: $(SUBDIRS:=.clean) extclean
+
 realclean: distclean
 
 distclean: $(SUBDIRS:=.distclean) clean