3 files changed, 43 insertions, 14 deletions
diff --git a/src/gallium/state_trackers/xvmc/.gitignore b/src/gallium/state_trackers/xvmc/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/state_trackers/xvmc/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/state_trackers/xvmc/Makefile b/src/gallium/state_trackers/xvmc/Makefile
deleted file mode 100644
index c54bd7a8433..00000000000
--- a/src/gallium/state_trackers/xvmc/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = xvmctracker
-
-LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I xvmc)
-
-C_SOURCES = block.c \
-            surface.c \
-            context.c \
-            subpicture.c \
-            attributes.c
-
-include ../../Makefile.template
diff --git a/src/gallium/state_trackers/xvmc/Makefile.am b/src/gallium/state_trackers/xvmc/Makefile.am
new file mode 100644
index 00000000000..b3b2e2f4ad3
--- /dev/null
+++ b/src/gallium/state_trackers/xvmc/Makefile.am
@@ -0,0 +1,42 @@
+# 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.
+
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	$(GALLIUM_CFLAGS) \
+	$(XVMC_CFLAGS)
+
+noinst_LTLIBRARIES = libxvmctracker.la
+
+libxvmctracker_la_SOURCES = \
+	block.c \
+	surface.c \
+	context.c \
+	subpicture.c \
+	attributes.c
+
+#XXX: Delete this when all targets that rely on xvmctracker are converted to automake.
+all-local: libxvmctracker.la
+	ln -f $(builddir)/.libs/libxvmctracker.a $(builddir)/libxvmctracker.a
+
+CLEANFILES = libxvmctracker.a