diff options
author | Matt Turner <mattst88@gmail.com> | 2012-09-05 15:59:54 -0700 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2012-12-06 11:53:38 +0100 |
commit | c978e26e9d73ec543c9c12dda2c46ecead348c69 (patch) | |
tree | 9261baee88d677082bace17b1e686d9402a7c0ff | |
parent | c7e2555c917d4efb8904e8215713f901219442ef (diff) |
targets/vdpau-r300: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Add missing vdpau state tracker to _LIBADD variable
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-r300/.gitignore | 1 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-r300/Makefile | 28 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-r300/Makefile.am | 48 |
4 files changed, 50 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index 2d4207c5bc..006a5966c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2034,6 +2034,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/opencl/Makefile src/gallium/targets/libgl-xlib/Makefile src/gallium/targets/vdpau-nouveau/Makefile + src/gallium/targets/vdpau-r300/Makefile src/gallium/winsys/Makefile src/gallium/winsys/i915/drm/Makefile src/gallium/winsys/i915/sw/Makefile diff --git a/src/gallium/targets/vdpau-r300/.gitignore b/src/gallium/targets/vdpau-r300/.gitignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/src/gallium/targets/vdpau-r300/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/vdpau-r300/Makefile b/src/gallium/targets/vdpau-r300/Makefile deleted file mode 100644 index cc9252d1df..0000000000 --- a/src/gallium/targets/vdpau-r300/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBBASENAME = vdpau_r300 - -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/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/galahad/libgalahad.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.vdpau - -symlinks: diff --git a/src/gallium/targets/vdpau-r300/Makefile.am b/src/gallium/targets/vdpau-r300/Makefile.am new file mode 100644 index 0000000000..1278ced4e9 --- /dev/null +++ b/src/gallium/targets/vdpau-r300/Makefile.am @@ -0,0 +1,48 @@ +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 + +vdpaudir = $(VDPAU_LIB_INSTALL_DIR) +vdpau_LTLIBRARIES = libvdpau_r300.la + +nodist_EXTRA_libvdpau_r300_la_SOURCES = dummy.cpp +libvdpau_r300_la_SOURCES = \ + target.c \ + $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c + +libvdpau_r300_la_LDFLAGS = \ + -module \ + -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ + -shared \ + -no-undefined + +libvdpau_r300_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/vdpau/libvdpautracker.la \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ + $(GALLIUM_DRI_LIB_DEPS) \ + $(VDPAU_LIBS) \ + $(LIBDRM_LIBS) \ + $(RADEON_LIBS) + +if HAVE_MESA_LLVM +libvdpau_r300_la_LDFLAGS += $(LLVM_LDFLAGS) +libvdpau_r300_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: libvdpau_r300.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium + ln -f .libs/libvdpau_r300.so* $(top_builddir)/$(LIB_DIR)/gallium/ |