3 files changed, 75 insertions, 24 deletions
diff --git a/src/gallium/targets/xvmc-r600/.gitignore b/src/gallium/targets/xvmc-r600/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/targets/xvmc-r600/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/targets/xvmc-r600/Makefile b/src/gallium/targets/xvmc-r600/Makefile
deleted file mode 100644
index 3ef5b1aef02..00000000000
--- a/src/gallium/targets/xvmc-r600/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBBASENAME = XvMCr600
-
-DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
-
-PIPE_DRIVERS = \
-	$(TOP)/src/gallium/drivers/r600/libr600.a \
-	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/auxiliary/libgallium.a
-
-C_SOURCES = \
-	target.c \
-	$(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
-	$(COMMON_GALLIUM_SOURCES) \
-	$(DRIVER_SOURCES)
-
-DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes
-
-include ../Makefile.xvmc
-
-symlinks:
diff --git a/src/gallium/targets/xvmc-r600/Makefile.am b/src/gallium/targets/xvmc-r600/Makefile.am
new file mode 100644
index 00000000000..b337c7ea6e3
--- /dev/null
+++ b/src/gallium/targets/xvmc-r600/Makefile.am
@@ -0,0 +1,74 @@
+# 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) \
+	$(PTHREAD_CFLAGS) \
+	$(LIBDRM_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/src/gallium/winsys
+
+xvmcdir = $(XVMC_LIB_INSTALL_DIR)
+xvmc_LTLIBRARIES = libXvMCr600.la
+
+libXvMCr600_la_SOURCES = \
+	target.c \
+	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+libXvMCr600_la_LDFLAGS = \
+	-module \
+	-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
+	-shared \
+	-no-undefined
+
+libXvMCr600_la_LIBADD = \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
+	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
+	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
+	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+	$(GALLIUM_DRI_LIB_DEPS) \
+	$(XVMC_LIBS) \
+	$(LIBDRM_LIBS) \
+	$(RADEON_LIBS)
+
+if HAVE_MESA_LLVM
+libXvMCr600_la_LINK = $(CXXLINK) $(libXvMCr600_la_LDFLAGS)
+# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
+nodist_EXTRA_libXvMCr600_la_SOURCES = dummy-cpp.cpp
+
+libXvMCr600_la_LDFLAGS += $(LLVM_LDFLAGS)
+libXvMCr600_la_LIBADD += $(LLVM_LIBS)
+else
+libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS)
+# Mention a dummy pure C file to trigger generation of the $(LINK) variable
+nodist_EXTRA_libXvMCr600_la_SOURCES = dummy-c.c
+endif
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the driver into /lib of the build tree.
+all-local: libXvMCr600.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
+	ln -f .libs/libXvMCr600.so* $(top_builddir)/$(LIB_DIR)/gallium/