From af6a2e4f820631e3bb64ad726ad774af45f1759d Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 7 Sep 2012 14:03:27 -0700 Subject: [PATCH] targets/xvmc-softpipe: Convert to automake v2: Andreas Boll - add missing xvmc state tracker to _LIBADD variable v3: Andreas Boll - Provide compatibility with scripts for the old Mesa build system --- configure.ac | 1 + src/gallium/targets/xvmc-softpipe/.gitignore | 1 + src/gallium/targets/xvmc-softpipe/Makefile | 21 -------- src/gallium/targets/xvmc-softpipe/Makefile.am | 72 +++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 21 deletions(-) create mode 100644 src/gallium/targets/xvmc-softpipe/.gitignore delete mode 100644 src/gallium/targets/xvmc-softpipe/Makefile create mode 100644 src/gallium/targets/xvmc-softpipe/Makefile.am diff --git a/configure.ac b/configure.ac index d00df42..6a8bedc 100644 --- a/configure.ac +++ b/configure.ac @@ -2082,6 +2082,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/xvmc-nouveau/Makefile src/gallium/targets/xvmc-r300/Makefile src/gallium/targets/xvmc-r600/Makefile + src/gallium/targets/xvmc-softpipe/Makefile src/gallium/winsys/Makefile src/gallium/winsys/i915/drm/Makefile src/gallium/winsys/i915/sw/Makefile diff --git a/src/gallium/targets/xvmc-softpipe/.gitignore b/src/gallium/targets/xvmc-softpipe/.gitignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/src/gallium/targets/xvmc-softpipe/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/xvmc-softpipe/Makefile b/src/gallium/targets/xvmc-softpipe/Makefile deleted file mode 100644 index 35db16f..0000000 --- a/src/gallium/targets/xvmc-softpipe/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBBASENAME = XvMCsoftpipe - -DRIVER_DEFINES = -DGALLIUM_SOFTPIPE -DRIVER_INCLUDES = - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/auxiliary/libgallium.a - -C_SOURCES = \ - $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c - -DRIVER_LIBS = - -include ../Makefile.xvmc - -symlinks: diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am b/src/gallium/targets/xvmc-softpipe/Makefile.am new file mode 100644 index 0000000..eea6700 --- /dev/null +++ b/src/gallium/targets/xvmc-softpipe/Makefile.am @@ -0,0 +1,72 @@ +# 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 = \ + -DGALLIUM_SOFTPIPE \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys + +xvmcdir = $(XVMC_LIB_INSTALL_DIR) +xvmc_LTLIBRARIES = libXvMCsoftpipe.la + +libXvMCsoftpipe_la_SOURCES = \ + $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c + +libXvMCsoftpipe_la_LDFLAGS = \ + -module \ + -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ + -shared \ + -no-undefined + +libXvMCsoftpipe_la_LIBADD = \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ + $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ + $(XVMC_LIBS) \ + $(DLOPEN_LIBS) \ + $(LIBDRM_LIBS) + +if HAVE_MESA_LLVM +libXvMCsoftpipe_la_LINK = $(CXXLINK) $(libXvMCsoftpipe_la_LDFLAGS) +# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable +nodist_EXTRA_libXvMCsoftpipe_la_SOURCES = dummy-cpp.cpp + +AM_CPPFLAGS += -DGALLIUM_LLVMPIPE +libXvMCsoftpipe_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) +else +libXvMCsoftpipe_la_LINK = $(LINK) $(libXvMCsoftpipe_la_LDFLAGS) +# Mention a dummy pure C file to trigger generation of the $(LINK) variable +nodist_EXTRA_libXvMCsoftpipe_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: libXvMCsoftpipe.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium + ln -f .libs/libXvMCsoftpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/ -- 2.7.4