diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-21 15:20:11 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-24 10:44:00 +0100 |
| commit | 0e59153229f6e04296ee938d084e9d6f522fd146 (patch) | |
| tree | ee397c07118c6382ec8b73ee0eea9c20de02e3ee /src/gallium/targets/xa | |
| parent | 6e1f846ce09e93d2a6157da1587b546080e48211 (diff) | |
| download | external_mesa3d-0e59153229f6e04296ee938d084e9d6f522fd146.zip external_mesa3d-0e59153229f6e04296ee938d084e9d6f522fd146.tar.gz external_mesa3d-0e59153229f6e04296ee938d084e9d6f522fd146.tar.bz2 | |
gallium/nouveau: add automake target 'template'
Rather than duplicating the libdeps, extra define... all over the
targets, define them only once and use when applicable.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/gallium/targets/xa')
| -rw-r--r-- | src/gallium/targets/xa/Makefile.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 1a37b9a..4cd820b 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -57,6 +57,10 @@ STATIC_TARGET_CPPFLAGS = STATIC_TARGET_LIB_DEPS = \ $(top_builddir)/src/loader/libloader.la +TARGET_DRIVERS = +TARGET_CPPFLAGS = +TARGET_LIB_DEPS = + if HAVE_GALLIUM_I915 STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915 STATIC_TARGET_LIB_DEPS += \ @@ -73,13 +77,7 @@ STATIC_TARGET_LIB_DEPS += \ $(INTEL_LIBS) endif -if HAVE_GALLIUM_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 +include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc if HAVE_GALLIUM_SVGA STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX @@ -98,8 +96,8 @@ STATIC_TARGET_LIB_DEPS += \ endif libxatracker_la_SOURCES += target.c -libxatracker_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) -libxatracker_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) +libxatracker_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) +libxatracker_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) else # HAVE_GALLIUM_STATIC_TARGETS |