diff options
author | Emil Velikov <[email protected]> | 2014-09-21 15:38:07 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-09-24 10:44:00 +0100 |
commit | ca32ce40b15d6b6cf025a0d1a479adb812a248a7 (patch) | |
tree | cf9222c114faa6f7796f2e8f365f00271e5042bf | |
parent | defd48c6c5d29530394cde110961225f116d57c2 (diff) |
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 <[email protected]>
Acked-by: Matt Turner <[email protected]>
-rw-r--r-- | src/gallium/drivers/ilo/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/ilo/Automake.inc b/src/gallium/drivers/ilo/Automake.inc new file mode 100644 index 00000000000..5124671180e --- /dev/null +++ b/src/gallium/drivers/ilo/Automake.inc @@ -0,0 +1,11 @@ +if HAVE_GALLIUM_ILO + +TARGET_DRIVERS += ilo +TARGET_CPPFLAGS += -DGALLIUM_ILO +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ + $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ + $(INTEL_LIBS) \ + $(LIBDRM_LIBS) + +endif diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 9fabdc27bba..f76a953148d 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 33c6c0a29bf..0d231a5914e 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 f339faeebf8..b7602cc6fda 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 c03edd46c50..a76ea8dd318 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 |