gallium: Improve recursive makefiles

diff --git a/src/gallium/Makefile b/src/gallium/Makefile
index 875314f..79ca767 100644 (file)
--- a/src/gallium/Makefile
+++ b/src/gallium/Makefile
@@ -1,26 +1,12 @@
+# src/gallium/Makefile
 TOP = ../..
 include $(TOP)/configs/current
 
-
 SUBDIRS = $(GALLIUM_DIRS)
-# Note winsys/ needs to be built after src/mesa
-
-
-default: subdirs
-
 
-subdirs:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-
-
-clean:
-       rm -f `find . -name \*.[oa]`
-       rm -f `find . -name depend`
-
-
-# Dummy install target
-install:

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index eaa0f2f..5446eb6 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -1,20 +1,12 @@
+# src/gallium/auxiliary/Makefile
 TOP = ../../..
 include $(TOP)/configs/current
 
-
 SUBDIRS = $(GALLIUM_AUXILIARY_DIRS)
 
-
-default: subdirs
-
-
-subdirs:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-
-
-clean:
-       rm -f `find . -name \*.[oa]`

diff --git a/src/gallium/drivers/Makefile b/src/gallium/drivers/Makefile
index 6161cb6..9211a93 100644 (file)
--- a/src/gallium/drivers/Makefile
+++ b/src/gallium/drivers/Makefile
@@ -1,20 +1,12 @@
+# src/gallium/drivers/Makefile
 TOP = ../../..
 include $(TOP)/configs/current
 
-
 SUBDIRS = $(GALLIUM_DRIVER_DIRS)
 
-
-default: subdirs
-
-
-subdirs:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-
-
-clean:
-       rm -f `find . -name \*.[oa]`

diff --git a/src/gallium/winsys/Makefile b/src/gallium/winsys/Makefile
index 2360a6a..bce5b3f 100644 (file)
--- a/src/gallium/winsys/Makefile
+++ b/src/gallium/winsys/Makefile
@@ -1,24 +1,12 @@
+# src/gallium/winsys/Makefile
 TOP = ../../..
 include $(TOP)/configs/current
 
-
 SUBDIRS = $(GALLIUM_WINSYS_DIRS)
 
-
-default: subdirs
-
-
-subdirs:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-
-
-clean:
-       rm -f `find . -name \*.[oa]`
-
-
-# Dummy install target
-install:

diff --git a/src/gallium/winsys/drm/Makefile b/src/gallium/winsys/drm/Makefile
index a84fcd8..fee0191 100644 (file)
--- a/src/gallium/winsys/drm/Makefile
+++ b/src/gallium/winsys/drm/Makefile
@@ -1,38 +1,12 @@
-# src/gallium/winsys/drm/Makefile
-
+# src/gallium/winsys/Makefile
 TOP = ../../../..
-
 include $(TOP)/configs/current
 
 SUBDIRS = $(GALLIUM_WINSYS_DRM_DIRS)
 
-default: $(TOP)/$(LIB_DIR)/gallium subdirs
-
-
-$(TOP)/$(LIB_DIR)/gallium:
-       -mkdir -p $(TOP)/$(LIB_DIR)/gallium
-
-
-subdirs:
-       @for dir in $(SUBDIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
-               fi \
-       done
-
-
-install:
-       @for dir in $(SUBDIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) install) || exit 1 ; \
-               fi \
-       done
-
-
-clean:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) clean) ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-       -rm -f common/*.o

diff --git a/src/gallium/winsys/drm/intel/Makefile b/src/gallium/winsys/drm/intel/Makefile
index 78773b8..d8feef6 100644 (file)
--- a/src/gallium/winsys/drm/intel/Makefile
+++ b/src/gallium/winsys/drm/intel/Makefile
@@ -1,27 +1,12 @@
+# src/gallium/winsys/drm/intel/Makefile
 TOP = ../../../../..
 include $(TOP)/configs/current
 
-
-# Always build gem and then build winsys with
-# enabled state trackers
 SUBDIRS = gem $(GALLIUM_STATE_TRACKERS_DIRS)
 
-
-default: subdirs
-
-
-subdirs:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-
-
-clean:
-       rm -f `find . -name \*.[oa]`
-       rm -f `find . -name depend`
-
-
-# Dummy install target
-install:

diff --git a/src/gallium/winsys/drm/nouveau/Makefile b/src/gallium/winsys/drm/nouveau/Makefile
index b573532..652cf71 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/Makefile
+++ b/src/gallium/winsys/drm/nouveau/Makefile
@@ -1,25 +1,12 @@
+# src/gallium/winsys/drm/nouveau/Makefile
 TOP = ../../../../..
 include $(TOP)/configs/current
 
-
 SUBDIRS = common dri
 
-
-default: subdirs
-
-
-subdirs:
+default install clean:
        @for dir in $(SUBDIRS) ; do \
                if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE)) || exit 1 ; \
+                       (cd $$dir && $(MAKE) $@) || exit 1; \
                fi \
        done
-
-
-clean:
-       rm -f `find . -name \*.[oa]`
-       rm -f `find . -name depend`
-
-
-# Dummy install target
-install: