C++ fixes, mostly casts (Stephane Conversy)

[mesa.git] / progs / Makefile

diff --git a/progs/Makefile b/progs/Makefile
index 7f4ee09961951f3a658d6f27e4b38836bc13a649..858d628c0a597f5738409374fc9e515d028650e5 100644 (file)
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -7,10 +7,17 @@ include $(TOP)/configs/current
 SUBDIRS = $(PROGRAM_DIRS)
 
 
-default: $(TOP)/configs/current
+default: message subdirs
+
+
+message:
+       @echo "Making programs for" $(CONFIG_NAME)
+
+
+subdirs:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir ; make) ; \
+                       (cd $$dir ; $(MAKE)) || exit 1 ; \
                fi \
        done
 
@@ -18,6 +25,6 @@ default: $(TOP)/configs/current
 clean:
        @for dir in $(SUBDIRS) tests ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir ; make clean) ; \
+                       (cd $$dir ; $(MAKE) clean) ; \
                fi \
        done