Mesa (master): gallium/svga: add automake target 'template'
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Sep 24 10:10:35 UTC 2014
Module: Mesa
Branch: master
Commit: fd4cd8e20a80a0b16f8e97c06efabc56547aa749
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd4cd8e20a80a0b16f8e97c06efabc56547aa749
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Sep 21 15:41:51 2014 +0100
gallium/svga: 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 at gmail.com>
Acked-by: Matt Turner <mattst88 at gmail.com>
---
src/gallium/drivers/svga/Automake.inc | 10 ++++++++++
src/gallium/targets/dri/Makefile.am | 8 +-------
src/gallium/targets/egl-static/Makefile.am | 7 +------
src/gallium/targets/gbm/Makefile.am | 7 +------
src/gallium/targets/xa/Makefile.am | 7 +------
5 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/src/gallium/drivers/svga/Automake.inc b/src/gallium/drivers/svga/Automake.inc
new file mode 100644
index 0000000..d2d1d8f
--- /dev/null
+++ b/src/gallium/drivers/svga/Automake.inc
@@ -0,0 +1,10 @@
+if HAVE_GALLIUM_SVGA
+
+TARGET_DRIVERS += vmwgfx
+TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
+TARGET_LIB_DEPS += \
+ $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
+ $(top_builddir)/src/gallium/drivers/svga/libsvga.la \
+ $(LIBDRM_LIBS)
+
+endif
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index f76a953..cf4a025 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -108,13 +108,7 @@ STATIC_TARGET_LIB_DEPS += \
$(RADEON_LIBS)
endif
-if HAVE_GALLIUM_SVGA
-MEGADRIVERS += vmwgfx
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
-STATIC_TARGET_LIB_DEPS += \
- $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
- $(top_builddir)/src/gallium/drivers/svga/libsvga.la
-endif
+include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 0d231a5..507c957 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -198,12 +198,7 @@ egl_gallium_la_LIBADD += \
$(RADEON_LIBS)
endif
-if HAVE_GALLIUM_SVGA
-egl_gallium_la_CPPFLAGS += -DGALLIUM_VMWGFX
-egl_gallium_la_LIBADD += \
- $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
- $(top_builddir)/src/gallium/drivers/svga/libsvga.la
-endif
+include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index b7602cc..f1166f0 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -97,12 +97,7 @@ STATIC_TARGET_LIB_DEPS += \
$(RADEON_LIBS)
endif
-if HAVE_GALLIUM_SVGA
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
-STATIC_TARGET_LIB_DEPS += \
- $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
- $(top_builddir)/src/gallium/drivers/svga/libsvga.la
-endif
+include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
index a76ea8d..e26b43a 100644
--- a/src/gallium/targets/xa/Makefile.am
+++ b/src/gallium/targets/xa/Makefile.am
@@ -67,12 +67,7 @@ include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc
include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-if HAVE_GALLIUM_SVGA
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
-STATIC_TARGET_LIB_DEPS += \
- $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
- $(top_builddir)/src/gallium/drivers/svga/libsvga.la
-endif
+include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
More information about the mesa-commit
mailing list