summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-09-21 16:31:14 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-09-24 10:44:01 +0100
commit3d909864c8006332aa4c2155356ec68fdc8dbc28 (patch)
tree0d4169d7131852ffa7384b4ba3a3c07ab1f23306
parentc2b5d7024e8b348fca5f666376d07685d1a45a8c (diff)
downloadexternal_mesa3d-3d909864c8006332aa4c2155356ec68fdc8dbc28.zip
external_mesa3d-3d909864c8006332aa4c2155356ec68fdc8dbc28.tar.gz
external_mesa3d-3d909864c8006332aa4c2155356ec68fdc8dbc28.tar.bz2
gallium/vc4: add automake target 'templates'
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>
-rw-r--r--src/gallium/drivers/vc4/Automake.inc13
-rw-r--r--src/gallium/targets/dri/Makefile.am12
2 files changed, 14 insertions, 11 deletions
diff --git a/src/gallium/drivers/vc4/Automake.inc b/src/gallium/drivers/vc4/Automake.inc
new file mode 100644
index 0000000..6fa3e19
--- /dev/null
+++ b/src/gallium/drivers/vc4/Automake.inc
@@ -0,0 +1,13 @@
+if HAVE_GALLIUM_VC4
+
+TARGET_DRIVERS += vc4
+TARGET_CPPFLAGS += -DGALLIUM_VC4
+TARGET_LIB_DEPS += \
+ $(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \
+ $(top_builddir)/src/gallium/drivers/vc4/libvc4.la
+
+if USE_VC4_SIMULATOR
+TARGET_CPPFLAGS += -DUSE_VC4_SIMULATOR
+endif
+
+endif
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 0143694..2451358 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -82,17 +82,7 @@ include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
-if HAVE_GALLIUM_VC4
-MEGADRIVERS += vc4
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_VC4
-STATIC_TARGET_LIB_DEPS += \
- $(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \
- $(top_builddir)/src/gallium/drivers/vc4/libvc4.la
-
-if USE_VC4_SIMULATOR
-STATIC_TARGET_CPPFLAGS += -DUSE_VC4_SIMULATOR
-endif
-endif
+include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
if HAVE_GALLIUM_SOFTPIPE
MEGADRIVERS += swrast