targets/xvmc-r300: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Add missing xvmc state tracker to _LIBADD variable

v3: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

diff --git a/configure.ac b/configure.ac
index 87a71587331663d00fa870ff5cecb77896109ade..2d849830e79662a7da860e59f06e015eba380d18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2080,6 +2080,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/targets/xorg-r600/Makefile
                src/gallium/targets/xorg-radeonsi/Makefile
                src/gallium/targets/xvmc-nouveau/Makefile
+               src/gallium/targets/xvmc-r300/Makefile
                src/gallium/winsys/Makefile
                src/gallium/winsys/i915/drm/Makefile
                src/gallium/winsys/i915/sw/Makefile

diff --git a/src/gallium/targets/xvmc-r300/.gitignore b/src/gallium/targets/xvmc-r300/.gitignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/targets/xvmc-r300/.gitignore
@@ -0,0 +1 @@
+Makefile

diff --git a/src/gallium/targets/xvmc-r300/Makefile b/src/gallium/targets/xvmc-r300/Makefile
deleted file mode 100644 (file)
index 0bf75cb..0000000
--- a/src/gallium/targets/xvmc-r300/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBBASENAME = XvMCr300
-
-DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
-
-PIPE_DRIVERS = \
-        $(TOP)/src/gallium/drivers/r300/libr300-helper.a \
-        $(TOP)/src/gallium/drivers/r300/libr300.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-r300/Makefile.am b/src/gallium/targets/xvmc-r300/Makefile.am
new file mode 100644 (file)
index 0000000..4346b68
--- /dev/null
+++ b/src/gallium/targets/xvmc-r300/Makefile.am
@@ -0,0 +1,68 @@
+# 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 = libXvMCr300.la
+
+nodist_EXTRA_libXvMCr300_la_SOURCES = dummy.cpp
+libXvMCr300_la_SOURCES = \
+       target.c \
+       $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+libXvMCr300_la_LDFLAGS = \
+       -module \
+       -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
+       -shared \
+       -no-undefined
+
+libXvMCr300_la_LIBADD = \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+        $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \
+        $(top_builddir)/src/gallium/drivers/r300/libr300.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
+libXvMCr300_la_LDFLAGS += $(LLVM_LDFLAGS)
+libXvMCr300_la_LIBADD += $(LLVM_LIBS)
+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: libXvMCr300.la
+       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
+       ln -f .libs/libXvMCr300.so* $(top_builddir)/$(LIB_DIR)/gallium/