diff options
Diffstat (limited to 'src/gallium/targets/xvmc')
-rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 13 |
1 files changed, 4 insertions, 9 deletions
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; \ |