Merge branch '7.8'

[mesa.git] / progs / Makefile

diff --git a/progs/Makefile b/progs/Makefile
index f925de5860b8c42d0dbc431f5f465f4a42e96963..5bc444e952425d52ca50038329688d6ba36ceb97 100644 (file)
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -7,21 +7,26 @@ include $(TOP)/configs/current
 SUBDIRS = $(PROGRAM_DIRS)
 
 
-default: $(TOP)/configs/current
-       @for dir in $(SUBDIRS) ; do \
+default: message subdirs
+
+
+message:
+       @echo "Making programs for" $(CONFIG_NAME)
+
+
+subdirs:
+       @list='$(SUBDIRS)'; for dir in $$list ; do \
                if [ -d $$dir ] ; then \
-                       pushd $$dir ; \
-                       make ; \
-                       popd ; \
+                       (cd $$dir && $(MAKE)) || exit 1 ; \
                fi \
        done
 
+# Dummy install target
+install:
 
 clean:
-       @for dir in $(SUBDIRS) ; do \
+       @list='$(SUBDIRS)'; for dir in $$list tests ; do \
                if [ -d $$dir ] ; then \
-                       pushd $$dir ; \
-                       make clean; \
-                       popd ; \
+                       (cd $$dir && $(MAKE) clean) ; \
                fi \
        done