From: Emil Velikov Date: Sun, 21 Sep 2014 14:41:51 +0000 (+0100) Subject: gallium/svga: add automake target 'template' X-Git-Tag: upstream/17.1.0~23349 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd4cd8e20a80a0b16f8e97c06efabc56547aa749;p=platform%2Fupstream%2Fmesa.git 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 Acked-by: Matt Turner --- 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