gallium/softpipe,llvmpipe: 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>

diff --git a/src/gallium/drivers/llvmpipe/Automake.inc b/src/gallium/drivers/llvmpipe/Automake.inc
new file mode 100644 (file)
index 0000000..0a0aa34
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/Automake.inc
@@ -0,0 +1,7 @@
+if HAVE_GALLIUM_LLVMPIPE
+
+TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
+TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
+
+endif

diff --git a/src/gallium/drivers/softpipe/Automake.inc b/src/gallium/drivers/softpipe/Automake.inc
new file mode 100644 (file)
index 0000000..6455f3c
--- /dev/null
+++ b/src/gallium/drivers/softpipe/Automake.inc
@@ -0,0 +1,15 @@
+if HAVE_GALLIUM_SOFTPIPE
+
+TARGET_DRIVERS += swrast
+TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE
+TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
+       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
+
+if HAVE_DRI2
+TARGET_DRIVERS += kms_swrast
+TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la
+
+endif
+endif

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index fe9624fa301200e56f14ecdd2a6833c646398776..b74c29e55471f40176fc29b3b2a8beb474d3b9f7 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -84,25 +84,8 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
 
-if HAVE_GALLIUM_SOFTPIPE
-MEGADRIVERS += swrast
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
-       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
-
-if HAVE_DRI2
-MEGADRIVERS += kms_swrast
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la
-endif
-endif
-
-if HAVE_GALLIUM_LLVMPIPE
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-endif
+include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
 
 if HAVE_GALLIUM_STATIC_TARGETS
 

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index fdb1ba2ced80bff238565936ad9d08c753589126..9e0b1f76ddfeaff22ab69bd0940df332eeddc044 100644 (file)
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -175,17 +175,8 @@ include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
 
-if HAVE_GALLIUM_SOFTPIPE
-egl_gallium_la_CPPFLAGS += -DGALLIUM_SOFTPIPE
-egl_gallium_la_LIBADD += \
-       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
-endif
-
-if HAVE_GALLIUM_LLVMPIPE
-egl_gallium_la_CPPFLAGS += -DGALLIUM_LLVMPIPE
-egl_gallium_la_LIBADD += \
-       $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-endif
+include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
 
 egl_gallium_la_CPPFLAGS += $(TARGET_CPPFLAGS)
 egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \