KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2014-09-24 10:41:30 +01:00
parent 0f3c0ff17b
commit a37b9bb555
7 changed files with 26 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/targets/dri/Makefile.am
View File

@ -59,14 +59,9 @@ gallium_dri_la_LIBADD = \
gallium_dri_la_LDFLAGS += \
-Wl,--allow-multiple-definition
MEGADRIVERS =
STATIC_TARGET_CPPFLAGS =
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/i915/Automake.inc
@ -90,8 +85,8 @@ include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
if HAVE_GALLIUM_STATIC_TARGETS
gallium_dri_la_SOURCES += target.c
AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \
gallium_dri_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
gallium_dri_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS
@ -113,7 +108,7 @@ if HAVE_COMPAT_SYMLINKS
all-local: $(dri_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=gallium_dri.so; \
k=$${i}_dri.so; \
ln -f .libs/$${j} \
@ -125,7 +120,7 @@ endif
# gallium_dri.so in the set of final installed files.
install-data-hook:
$(AM_V_GEN)dest_dir=$(DESTDIR)/$(dridir); \
for i in $(MEGADRIVERS) $(TARGET_DRIVERS); do \
for i in $(TARGET_DRIVERS); do \
j=gallium_dri.so; \
k=$${i}_dri.so; \
ln -f $${dest_dir}/$${j} \

6
src/gallium/targets/egl-static/Makefile.am
View File

@ -154,9 +154,6 @@ endif
#if HAVE_GALLIUM_STATIC_TARGETS
egl_gallium_la_LDFLAGS = $(AM_LDFLAGS)
egl_gallium_la_CPPFLAGS = $(AM_CPPFLAGS)
TARGET_DRIVERS =
TARGET_CPPFLAGS =
TARGET_LIB_DEPS =
@ -178,7 +175,8 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
egl_gallium_la_CPPFLAGS += $(TARGET_CPPFLAGS)
egl_gallium_la_LDFLAGS = $(AM_LDFLAGS)
egl_gallium_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)

10
src/gallium/targets/gbm/Makefile.am
View File

@ -52,13 +52,9 @@ endif
if HAVE_GALLIUM_STATIC_TARGETS
STATIC_TARGET_CPPFLAGS =
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/i915/Automake.inc
@ -75,8 +71,8 @@ include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
gbm_gallium_drm_la_SOURCES += target.c
gbm_gallium_drm_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
gbm_gallium_drm_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \
gbm_gallium_drm_la_CPPFLAGS = $(TARGET_CPPFLAGS)
gbm_gallium_drm_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS

11
src/gallium/targets/omx/Makefile.am
View File

@ -32,13 +32,10 @@ libomx_mesa_la_LIBADD = \
if HAVE_GALLIUM_STATIC_TARGETS
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
@ -46,8 +43,8 @@ include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
libomx_mesa_la_SOURCES += target.c
libomx_mesa_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
libomx_mesa_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \
libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libomx_mesa_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS

16
src/gallium/targets/vdpau/Makefile.am
View File

@ -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; \

10
src/gallium/targets/xa/Makefile.am
View File

@ -53,13 +53,9 @@ endif
if HAVE_GALLIUM_STATIC_TARGETS
STATIC_TARGET_CPPFLAGS =
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/i915/Automake.inc
@ -72,8 +68,8 @@ include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
libxatracker_la_SOURCES += target.c
libxatracker_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
libxatracker_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS)
libxatracker_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libxatracker_la_LIBADD += $(TARGET_LIB_DEPS)
else # HAVE_GALLIUM_STATIC_TARGETS

13
src/gallium/targets/xvmc/Makefile.am
View File

@ -32,14 +32,9 @@ libXvMCgallium_la_LIBADD = \
$(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
@ -48,8 +43,8 @@ include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
if HAVE_GALLIUM_STATIC_TARGETS
libXvMCgallium_la_SOURCES += target.c
libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \
libXvMCgallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libXvMCgallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS
@ -75,7 +70,7 @@ endif
# libXvMCgallium.so in the set of final installed files.
install-data-hook:
$(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir); \
for i in $(MEGADRIVERS) $(TARGET_DRIVERS); do \
for i in $(TARGET_DRIVERS); do \
j=libXvMCgallium.$(LIB_EXT); \
k=libXvMC$${i}.$(LIB_EXT); \
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \