From a37b9bb55558410e3fcb4aaf659539b3100d5102 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 24 Sep 2014 10:41:30 +0100 Subject: [PATCH] targets: drop the old MEGADRIVERS & STATIC_TARGET... variables No longer used/needed as of last commit. Signed-off-by: Emil Velikov Acked-by: Matt Turner --- src/gallium/targets/dri/Makefile.am | 15 +++++---------- src/gallium/targets/egl-static/Makefile.am | 6 ++---- src/gallium/targets/gbm/Makefile.am | 10 +++------- src/gallium/targets/omx/Makefile.am | 11 ++++------- src/gallium/targets/vdpau/Makefile.am | 16 +++++----------- src/gallium/targets/xa/Makefile.am | 10 +++------- src/gallium/targets/xvmc/Makefile.am | 13 ++++--------- 7 files changed, 26 insertions(+), 55 deletions(-) diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index b74c29e5547..1094ffd4960 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -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} \ diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 9e0b1f76ddf..ed9847dffe5 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -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) diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index ddd558ed382..2c9b425845a 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -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 diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index db6500c9450..8d1e5851689 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -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 diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 8f5d66d4da8..ce22508ed57 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; \ diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index e26b43aaa41..77d9fa68c20 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -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 diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 812e597a277..c78aadf29cc 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -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; \ -- 2.30.2