# HG changeset patch
# User nenolod
# Date 1164175745 28800
# Node ID eb768b801ab131eafe78636170e03b3bd915c4f3
# Parent  b8482261841d3974c91896420e59caa0b0acddf1
[svn] - add formal support for objective make overlays. this needs testing on BSD, but should work as I only used posix-compliant commands.

diff -r b8482261841d -r eb768b801ab1 ChangeLog
--- a/ChangeLog	Mon Nov 20 19:45:10 2006 -0800
+++ b/ChangeLog	Tue Nov 21 22:09:05 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-21 03:45:10 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [610]
+  - revise CXXFLAGS fix.
+  
+  trunk/m4/libFLAC.m4 |   10 ++++++----
+  1 file changed, 6 insertions(+), 4 deletions(-)
+
+
 2006-11-21 03:41:23 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [608]
   - fix flac113 crashes at startup time.
diff -r b8482261841d -r eb768b801ab1 mk/objective.mk
--- a/mk/objective.mk	Mon Nov 20 19:45:10 2006 -0800
+++ b/mk/objective.mk	Tue Nov 21 22:09:05 2006 -0800
@@ -10,12 +10,20 @@
 			$(INSTALL) -d -m 755 $(DESTDIR)/$$i; \
 		fi; \
 	done;
+	@if [ "x$(OVERLAYS)" != "x" ]; then \
+		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
+			if [ $(VERBOSITY) -gt 0 ]; then \
+				echo "[installing overlay: $$i]"; \
+			fi; \
+			(pushd $$i > /dev/null; OVERLAYS="" $(MAKE) install || exit; cd ..); \
+		done; \
+	fi
 	@if [ "x$(SUBDIRS)" != "x" ]; then \
 		for i in $(SUBDIRS); do \
 			if [ $(VERBOSITY) -gt 0 ]; then \
 				echo "[installing subobjective: $$i]"; \
 			fi; \
-			(cd $$i; $(MAKE) install || exit; cd ..); \
+			(cd $$i; OVERLAYS="" $(MAKE) install || exit; cd ..); \
 		done; \
 	fi
 	@if [ "x$(OBJECTIVE_DIRECTORIES)" != "x" ]; then \
@@ -60,12 +68,20 @@
 
 clean:
 	$(MAKE) clean-prehook
+	@if [ "x$(OVERLAYS)" != "x" ]; then \
+		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
+			if [ $(VERBOSITY) -gt 0 ]; then \
+				echo "[cleaning overlay: $$i]"; \
+			fi; \
+			(pushd $$i > /dev/null; OVERLAYS="" $(MAKE) clean || exit; popd); \
+		done; \
+	fi
 	@if [ "x$(SUBDIRS)" != "x" ]; then \
 		for i in $(SUBDIRS); do \
 			if [ $(VERBOSITY) -gt 0 ]; then \
 				echo "[cleaning subobjective: $$i]"; \
 			fi; \
-			(cd $$i; $(MAKE) clean || exit; cd ..); \
+			(cd $$i; OVERLAYS="" $(MAKE) clean || exit; cd ..); \
 		done; \
 	fi
 	$(MAKE) clean-posthook
@@ -90,12 +106,20 @@
 	fi
 
 distclean: clean
+	@if [ "x$(OVERLAYS)" != "x" ]; then \
+		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
+			if [ $(VERBOSITY) -gt 0 ]; then \
+				echo "[distcleaning overlay: $$i]"; \
+			fi; \
+			(pushd $$i > /dev/null; OVERLAYS="" $(MAKE) distclean || exit; popd); \
+		done; \
+	fi
 	@if [ "x$(SUBDIRS)" != "x" ]; then \
 		for i in $(SUBDIRS); do \
 			if [ $(VERBOSITY) -gt 0 ]; then \
 				echo "[distcleaning subobjective: $$i]"; \
 			fi; \
-			(cd $$i; $(MAKE) distclean || exit; cd ..); \
+			(cd $$i; OVERLAYS="" $(MAKE) distclean || exit; cd ..); \
 		done; \
 	fi
 	@if [ -f Makefile.in ]; then \
@@ -107,12 +131,23 @@
 
 build:
 	$(MAKE) build-prehook
+	@if [ "x$(OVERLAYS)" != "x" ]; then \
+		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
+			if [ $(VERBOSITY) -gt 0 ]; then \
+				echo "[building overlay: $$i]"; \
+			fi; \
+			(pushd $$i > /dev/null; OVERLAYS="" $(MAKE) || exit; popd); \
+			if [ $(VERBOSITY) -gt 0 ]; then \
+				echo "[finished overlay: $$i]"; \
+			fi; \
+		done; \
+	fi
 	@if [ "x$(SUBDIRS)" != "x" ]; then \
 		for i in $(SUBDIRS); do \
 			if [ $(VERBOSITY) -gt 0 ]; then \
 				echo "[building subobjective: $$i]"; \
 			fi; \
-			cd $$i; $(MAKE) || exit; cd ..; \
+			(cd $$i; OVERLAYS="" $(MAKE) || exit; cd ..); \
 			if [ $(VERBOSITY) -gt 0 ]; then \
 				echo "[finished subobjective: $$i]"; \
 			fi; \