diff options
Diffstat (limited to 'src/gallium/targets/xvmc/Makefile.am')
| -rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 0c8f87cd2c5..041d920ed3e 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -37,14 +37,11 @@ STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1 STATIC_TARGET_LIB_DEPS = \ $(top_builddir)/src/loader/libloader.la -if HAVE_GALLIUM_NOUVEAU -MEGADRIVERS += nouveau -STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ - $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ - $(NOUVEAU_LIBS) -endif +TARGET_DRIVERS = +TARGET_CPPFLAGS = +TARGET_LIB_DEPS = + +include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc if HAVE_GALLIUM_R600 MEGADRIVERS += r600 @@ -59,8 +56,8 @@ endif if HAVE_GALLIUM_STATIC_TARGETS libXvMCgallium_la_SOURCES += target.c -libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) -libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) +libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) +libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) else # HAVE_GALLIUM_STATIC_TARGETS @@ -85,7 +82,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); do \ + for i in $(MEGADRIVERS) $(TARGET_DRIVERS); do \ j=libXvMCgallium.$(LIB_EXT); \ k=libXvMC$${i}.$(LIB_EXT); \ l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ |