diff options
author | Emil Velikov <[email protected]> | 2014-09-21 15:34:07 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-09-24 10:44:00 +0100 |
commit | defd48c6c5d29530394cde110961225f116d57c2 (patch) | |
tree | 33d0ff48d6d0322f1f10d761bbb1165f8fec253e /src/gallium | |
parent | 97bec98ac981d5d973f8b2b11d89d967aad7628b (diff) |
gallium/i915: 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 <[email protected]>
Acked-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/i915/Automake.inc | 11 | ||||
-rw-r--r-- | src/gallium/targets/dri/Makefile.am | 9 | ||||
-rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 8 | ||||
-rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 8 | ||||
-rw-r--r-- | src/gallium/targets/xa/Makefile.am | 8 |
5 files changed, 15 insertions, 29 deletions
diff --git a/src/gallium/drivers/i915/Automake.inc b/src/gallium/drivers/i915/Automake.inc new file mode 100644 index 00000000000..8cb40f27d44 --- /dev/null +++ b/src/gallium/drivers/i915/Automake.inc @@ -0,0 +1,11 @@ +if HAVE_GALLIUM_I915 + +TARGET_DRIVERS += i915 +TARGET_CPPFLAGS += -DGALLIUM_I915 +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ + $(top_builddir)/src/gallium/drivers/i915/libi915.la \ + $(INTEL_LIBS) \ + $(LIBDRM_LIBS) + +endif diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 6f4bf2a0e75..9fabdc27bba 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -68,14 +68,7 @@ TARGET_DRIVERS = TARGET_CPPFLAGS = TARGET_LIB_DEPS = -if HAVE_GALLIUM_I915 -MEGADRIVERS += i915 -STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ - $(top_builddir)/src/gallium/drivers/i915/libi915.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc if HAVE_GALLIUM_ILO MEGADRIVERS += ilo diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 08c116cf5ce..33c6c0a29bf 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -161,13 +161,7 @@ TARGET_DRIVERS = TARGET_CPPFLAGS = TARGET_LIB_DEPS = -if HAVE_GALLIUM_I915 -egl_gallium_la_CPPFLAGS += -DGALLIUM_I915 -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ - $(top_builddir)/src/gallium/drivers/i915/libi915.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc if HAVE_GALLIUM_ILO egl_gallium_la_CPPFLAGS += -DGALLIUM_ILO diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index b2cd92cc2ad..f339faeebf8 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -60,13 +60,7 @@ TARGET_DRIVERS = TARGET_CPPFLAGS = TARGET_LIB_DEPS = -if HAVE_GALLIUM_I915 -STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ - $(top_builddir)/src/gallium/drivers/i915/libi915.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc if HAVE_GALLIUM_ILO STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 04f56c0cd81..c03edd46c50 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -61,13 +61,7 @@ TARGET_DRIVERS = TARGET_CPPFLAGS = TARGET_LIB_DEPS = -if HAVE_GALLIUM_I915 -STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ - $(top_builddir)/src/gallium/drivers/i915/libi915.la \ - $(INTEL_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc if HAVE_GALLIUM_ILO STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO |