Merge branch '7.8'

[mesa.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 7f8dfd09cd89f2e1ec86c2f0473c4b1aadbf5616..4f65da0e3b73acf2f3b10ff82633597d843df252 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,28 +7,34 @@ include $(TOP)/configs/current
 SUBDIRS = $(SRC_DIRS)
 
 
-default: $(LIB_DIR) subdirs
+default: message $(TOP)/$(LIB_DIR) subdirs
+
+
+message:
+       @echo "Making sources for" $(CONFIG_NAME)
 
 
 subdirs:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       pushd $$dir ; \
-                       make ; \
-                       popd ; \
+                       (cd $$dir && $(MAKE)) || exit 1; \
                fi \
        done
 
+install: $(TOP)/$(LIB_DIR)
+       @for dir in $(SUBDIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) install) || exit 1 ; \
+               fi \
+       done
 
-$(LIB_DIR):
-       -mkdir $(LIB_DIR)
+$(TOP)/$(LIB_DIR):
+       -@test -d $(TOP)/$(LIB_DIR) || mkdir -p $(TOP)/$(LIB_DIR)
 
 
 clean:
-       @for dir in $(SUBDIRS) ; do \
+       -@for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       pushd $$dir ; \
-                       make clean ; \
-                       popd ; \
+                       (cd $$dir && $(MAKE) clean) ; \
                fi \
        done