[Mesa-dev] [PATCH 01/32] automake: Convert Gallium target and winsys

[Matt Turner]

---
 configure.ac                    |    2 ++
 src/gallium/targets/.gitignore  |    1 +
 src/gallium/targets/Makefile    |   12 ------------
 src/gallium/targets/Makefile.am |    1 +
 src/gallium/winsys/.gitignore   |    1 +
 src/gallium/winsys/Makefile     |   12 ------------
 src/gallium/winsys/Makefile.am  |    1 +
 7 files changed, 6 insertions(+), 24 deletions(-)
 create mode 100644 src/gallium/targets/.gitignore
 delete mode 100644 src/gallium/targets/Makefile
 create mode 100644 src/gallium/targets/Makefile.am
 create mode 100644 src/gallium/winsys/.gitignore
 delete mode 100644 src/gallium/winsys/Makefile
 create mode 100644 src/gallium/winsys/Makefile.am

diff --git a/configure.ac b/configure.ac
index 0052918..1c5165f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2020,7 +2020,9 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/drivers/r300/Makefile
 		src/gallium/drivers/r600/Makefile
 		src/gallium/state_trackers/clover/Makefile
+		src/gallium/targets/Makefile
 		src/gallium/targets/opencl/Makefile
+		src/gallium/winsys/Makefile
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
 		src/glsl/Makefile
diff --git a/src/gallium/targets/.gitignore b/src/gallium/targets/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/targets/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/targets/Makefile b/src/gallium/targets/Makefile
deleted file mode 100644
index a0bc5eb..0000000
--- a/src/gallium/targets/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_TARGET_DIRS)
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1; \
-		fi \
-	done
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
new file mode 100644
index 0000000..deeefbe
--- /dev/null
+++ b/src/gallium/targets/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = $(GALLIUM_TARGET_DIRS)
diff --git a/src/gallium/winsys/.gitignore b/src/gallium/winsys/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/Makefile b/src/gallium/winsys/Makefile
deleted file mode 100644
index bce5b3f..0000000
--- a/src/gallium/winsys/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_WINSYS_DIRS)
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1; \
-		fi \
-	done
diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am
new file mode 100644
index 0000000..f2c96b3
--- /dev/null
+++ b/src/gallium/winsys/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = $(GALLIUM_WINSYS_DIRS)
-- 
1.7.8.6