diff options
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 1c33a91dff0..7c1bcf039df 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -53,8 +53,6 @@ gallium_dri_la_LIBADD = \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) -if HAVE_GALLIUM_STATIC_TARGETS - # XXX: Temporary allow duplicated symbols, as the loader pulls in xmlconfig.c # which already provides driParse* and driQuery* amongst others. # Remove this hack as we come up with a cleaner solution. @@ -177,6 +175,8 @@ STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la endif +if HAVE_GALLIUM_STATIC_TARGETS + gallium_dri_la_SOURCES += target.c AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS) gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 440cf2243a4..4d234fbab8c 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -37,8 +37,6 @@ libvdpau_gallium_la_LIBADD = \ $(GALLIUM_COMMON_LIB_DEPS) -if HAVE_GALLIUM_STATIC_TARGETS - MEGADRIVERS = STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1 STATIC_TARGET_LIB_DEPS = \ @@ -85,6 +83,8 @@ STATIC_TARGET_LIB_DEPS += \ $(RADEON_LIBS) endif +if HAVE_GALLIUM_STATIC_TARGETS + libvdpau_gallium_la_SOURCES += target.c libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 884bccf348e..0c8f87cd2c5 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -32,8 +32,6 @@ libXvMCgallium_la_LIBADD = \ $(GALLIUM_COMMON_LIB_DEPS) -if HAVE_GALLIUM_STATIC_TARGETS - MEGADRIVERS = STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1 STATIC_TARGET_LIB_DEPS = \ @@ -58,6 +56,8 @@ STATIC_TARGET_LIB_DEPS += \ $(RADEON_LIBS) endif +if HAVE_GALLIUM_STATIC_TARGETS + libXvMCgallium_la_SOURCES += target.c libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) |