4 files changed, 25 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 004f8cc2531..bfd3c0aa4d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2040,6 +2040,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/drivers/softpipe/Makefile
 		src/gallium/drivers/svga/Makefile
 		src/gallium/drivers/trace/Makefile
+		src/gallium/state_trackers/Makefile
 		src/gallium/state_trackers/clover/Makefile
 		src/gallium/state_trackers/dri/Makefile
 		src/gallium/state_trackers/dri/drm/Makefile
diff --git a/src/gallium/state_trackers/.gitignore b/src/gallium/state_trackers/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/state_trackers/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/state_trackers/Makefile b/src/gallium/state_trackers/Makefile
deleted file mode 100644
index d5162c17507..00000000000
--- a/src/gallium/state_trackers/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-TOP = ../../..
-include $(TOP)/configs/current
-
-
-SUBDIRS = $(GALLIUM_STATE_TRACKERS_DIRS)
-
-
-default: subdirs
-
-
-subdirs:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
-	done
-
-
-clean:
-	rm -f `find . -regex '.*\.l?[oa]'`
-	rm -f `find . -name depend`
-
-
-install:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1 ; \
-		fi \
-	done
diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am
new file mode 100644
index 00000000000..ef339d4f01a
--- /dev/null
+++ b/src/gallium/state_trackers/Makefile.am
@@ -0,0 +1,23 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+SUBDIRS = $(GALLIUM_STATE_TRACKERS_DIRS)