summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/egl-static
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-09-21 15:20:11 +0100
committerEmil Velikov <[email protected]>2014-09-24 10:44:00 +0100
commit0e59153229f6e04296ee938d084e9d6f522fd146 (patch)
treeee397c07118c6382ec8b73ee0eea9c20de02e3ee /src/gallium/targets/egl-static
parent6e1f846ce09e93d2a6157da1587b546080e48211 (diff)
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 <[email protected]> Acked-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium/targets/egl-static')
-rw-r--r--src/gallium/targets/egl-static/Makefile.am15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index a428be5ba83..16c457b3380 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -157,6 +157,10 @@ endif
egl_gallium_la_LDFLAGS = $(AM_LDFLAGS)
egl_gallium_la_CPPFLAGS = $(AM_CPPFLAGS)
+TARGET_DRIVERS =
+TARGET_CPPFLAGS =
+TARGET_LIB_DEPS =
+
if HAVE_GALLIUM_I915
egl_gallium_la_CPPFLAGS += -DGALLIUM_I915
egl_gallium_la_LIBADD += \
@@ -173,13 +177,7 @@ egl_gallium_la_LIBADD += \
$(INTEL_LIBS)
endif
-if HAVE_GALLIUM_NOUVEAU
-egl_gallium_la_CPPFLAGS += -DGALLIUM_NOUVEAU
-egl_gallium_la_LIBADD += \
- $(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 NEED_RADEON_DRM_WINSYS
egl_gallium_la_LIBADD += \
@@ -240,6 +238,9 @@ egl_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
endif
+egl_gallium_la_CPPFLAGS += $(TARGET_CPPFLAGS)
+egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS)
+
#else # HAVE_GALLIUM_STATIC_TARGETS
#egl_gallium_la_LIBADD += \