Backout last two commits. Merged rule breaks specific behavior

of each rule!

diff --git a/build/dir.mk b/build/dir.mk
index dfc5742dc6844af98eb521e8779cdefc9418b698..ebf4d813e75034d4c7af226bb60db3eedcf663a3 100644 (file)
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -6,13 +6,45 @@
 ## Makes subdirectories
 ##
 
-all-common install-common clean-common veryclean-common depend-common: FORCE
-       @t=`echo $@ | cut -d- -f1`; \
-       echo "Making $$t in `$(PWD)`"; \
-       for i in $(SUBDIRS); do \
-               echo "  Entering subdirectory $$i to execute:"; \
-               echo "    $(MAKE) $(MFLAGS) $$t"; \
-               ( cd $$i; $(MAKE) $(MFLAGS) $$t ); \
+
+all-common: FORCE
+       @echo "Making all in `$(PWD)`"
+       @for i in $(SUBDIRS) $(ALLDIRS); do             \
+               echo "  Entering subdirectory $$i";             \
+               ( cd $$i; $(MAKE) $(MFLAGS) all );              \
+               echo " ";                                                               \
+       done
+
+install-common: FORCE
+       @echo "Making install in `$(PWD)`"
+       @for i in $(SUBDIRS) $(INSTALLDIRS); do         \
+               echo "  Entering subdirectory $$i";             \
+               ( cd $$i; $(MAKE) $(MFLAGS) install );  \
+               echo " ";                                                               \
+       done
+
+clean-common: FORCE
+       @echo "Making clean in `$(PWD)`"
+       @for i in $(SUBDIRS) $(CLEANDIRS); do           \
+               echo "  Entering subdirectory $$i";             \
+               ( cd $$i; $(MAKE) $(MFLAGS) clean );    \
+               echo " ";                                                               \
+       done
+
+veryclean-common: FORCE
+       @echo "Making veryclean in `$(PWD)`"
+       @for i in $(SUBDIRS) $(CLEANDIRS); do           \
+               echo "  Entering subdirectory $$i";             \
+               ( cd $$i; $(MAKE) $(MFLAGS) veryclean );        \
+               echo " ";                                                               \
+       done
+
+depend-common: FORCE
+       @echo "Making depend in `$(PWD)`"
+       @for i in $(SUBDIRS) $(DEPENDDIRS); do          \
+               echo "  Entering subdirectory $$i";             \
+               ( cd $$i; $(MAKE) $(MFLAGS) depend );   \
+               echo " ";                                                               \
        done
 
 Makefile: $(top_srcdir)/build/dir.mk