Module: Mesa Branch: master Commit: 3d909864c8006332aa4c2155356ec68fdc8dbc28 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d909864c8006332aa4c2155356ec68fdc8dbc28
Author: Emil Velikov <emil.l.veli...@gmail.com> Date: Sun Sep 21 16:31:14 2014 +0100 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.veli...@gmail.com> Acked-by: Matt Turner <matts...@gmail.com> --- src/gallium/drivers/vc4/Automake.inc | 13 +++++++++++++ src/gallium/targets/dri/Makefile.am | 12 +----------- 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 _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
