From ca32ce40b15d6b6cf025a0d1a479adb812a248a7 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 21 Sep 2014 15:38:07 +0100 Subject: gallium/ilo: 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/targets/dri/Makefile.am | 9 +-------- src/gallium/targets/egl-static/Makefile.am | 8 +------- src/gallium/targets/gbm/Makefile.am | 8 +------- src/gallium/targets/xa/Makefile.am | 8 +------- 4 files changed, 4 insertions(+), 29 deletions(-) (limited to 'src/gallium/targets') diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 9fabdc2..f76a953 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -70,14 +70,7 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -if HAVE_GALLIUM_ILO -MEGADRIVERS += ilo -STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ - $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 33c6c0a..0d231a5 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -163,13 +163,7 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -if HAVE_GALLIUM_ILO -egl_gallium_la_CPPFLAGS += -DGALLIUM_ILO -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ - $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index f339fae..b7602cc 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -62,13 +62,7 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -if HAVE_GALLIUM_ILO -STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ - $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index c03edd4..a76ea8d 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -63,13 +63,7 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -if HAVE_GALLIUM_ILO -STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ - $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc -- cgit v1.1