summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/vdpau
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-09-24 10:41:30 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-09-24 10:44:01 +0100
commita37b9bb55558410e3fcb4aaf659539b3100d5102 (patch)
tree0594f06334129f954d7c3ae7acd477d4eec78339 /src/gallium/targets/vdpau
parent0f3c0ff17bad8da9dcb504560ad691db8294f6c9 (diff)
downloadexternal_mesa3d-a37b9bb55558410e3fcb4aaf659539b3100d5102.zip
external_mesa3d-a37b9bb55558410e3fcb4aaf659539b3100d5102.tar.gz
external_mesa3d-a37b9bb55558410e3fcb4aaf659539b3100d5102.tar.bz2
targets: drop the old MEGADRIVERS & STATIC_TARGET... variables
No longer used/needed as of last commit. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/gallium/targets/vdpau')
-rw-r--r--src/gallium/targets/vdpau/Makefile.am16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 8f5d66d..ce22508 100644
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -36,15 +36,9 @@ libvdpau_gallium_la_LIBADD = \
$(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
-
-MEGADRIVERS =
-STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1
-STATIC_TARGET_LIB_DEPS = \
- $(top_builddir)/src/loader/libloader.la
-
TARGET_DRIVERS =
TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
+TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
@@ -54,8 +48,8 @@ include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
if HAVE_GALLIUM_STATIC_TARGETS
libvdpau_gallium_la_SOURCES += target.c
-libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
-libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \
+libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
+libvdpau_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS
@@ -81,7 +75,7 @@ if HAVE_COMPAT_SYMLINKS
all-local: $(vdpau_LTLIBRARIES)
$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium; \
$(MKDIR_P) $${link_dir}; \
- for i in $(MEGADRIVERS) $(TARGET_DRIVERS); do \
+ for i in $(TARGET_DRIVERS); do \
j=libvdpau_gallium.$(LIB_EXT); \
k=libvdpau_$${i}.$(LIB_EXT); \
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
@@ -100,7 +94,7 @@ endif
# libvdpau_gallium.so in the set of final installed files.
install-data-hook:
$(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir); \
- for i in $(MEGADRIVERS) $(TARGET_DRIVERS); do \
+ for i in $(TARGET_DRIVERS); do \
j=libvdpau_gallium.$(LIB_EXT); \
k=libvdpau_$${i}.$(LIB_EXT); \
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \