From 97bec98ac981d5d973f8b2b11d89d967aad7628b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 21 Sep 2014 15:30:53 +0100 Subject: [PATCH] gallium/freedreno: 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 --- src/gallium/drivers/freedreno/Automake.inc | 11 +++++++++++ src/gallium/targets/dri/Makefile.am | 10 +--------- src/gallium/targets/egl-static/Makefile.am | 9 +-------- src/gallium/targets/gbm/Makefile.am | 9 +-------- src/gallium/targets/xa/Makefile.am | 9 +-------- 5 files changed, 15 insertions(+), 33 deletions(-) create mode 100644 src/gallium/drivers/freedreno/Automake.inc diff --git a/src/gallium/drivers/freedreno/Automake.inc b/src/gallium/drivers/freedreno/Automake.inc new file mode 100644 index 00000000000..1fdf91cf3a5 --- /dev/null +++ b/src/gallium/drivers/freedreno/Automake.inc @@ -0,0 +1,11 @@ +if HAVE_GALLIUM_FREEDRENO + +TARGET_DRIVERS += msm kgsl +TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ + $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ + $(FREEDRENO_LIBS) \ + $(LIBDRM_LIBS) + +endif diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index b75d7b09ee3..6f4bf2a0e75 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -130,15 +130,7 @@ STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/drivers/svga/libsvga.la endif -if HAVE_GALLIUM_FREEDRENO -MEGADRIVERS += msm kgsl -STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(FREEDRENO_LIBS) - -endif +include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc if HAVE_GALLIUM_VC4 MEGADRIVERS += vc4 diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 16c457b3380..08c116cf5ce 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -217,14 +217,7 @@ egl_gallium_la_LIBADD += \ $(top_builddir)/src/gallium/drivers/svga/libsvga.la endif -if HAVE_GALLIUM_FREEDRENO -egl_gallium_la_CPPFLAGS += -DGALLIUM_FREEDRENO -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(FREEDRENO_LIBS) - -endif +include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc if HAVE_GALLIUM_SOFTPIPE egl_gallium_la_CPPFLAGS += -DGALLIUM_SOFTPIPE diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 1271825f96b..b2cd92cc2ad 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -116,14 +116,7 @@ STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/drivers/svga/libsvga.la endif -if HAVE_GALLIUM_FREEDRENO -STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(FREEDRENO_LIBS) - -endif +include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc gbm_gallium_drm_la_SOURCES += target.c gbm_gallium_drm_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 4cd820b18ce..04f56c0cd81 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -86,14 +86,7 @@ STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/drivers/svga/libsvga.la endif -if HAVE_GALLIUM_FREEDRENO -STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(FREEDRENO_LIBS) - -endif +include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc libxatracker_la_SOURCES += target.c libxatracker_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -- 2.30.2