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 <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/gallium/drivers/ilo/Automake.inc b/src/gallium/drivers/ilo/Automake.inc
new file mode 100644 (file)
index 0000000..5124671
--- /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 9fabdc27bba113c07d03ccfc25965b6c5d9b41bc..f76a953148d9ffeb3c0a9e8c590a8bd462d35031 100644 (file)
--- 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 33c6c0a29bf65023bd415e2738363615c3754e85..0d231a5914ecdd33c1a1c8ce0b9c4f0686bbbac7 100644 (file)
--- 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 f339faeebf8f4220bb5420c6cedfb2673122ed76..b7602cc6fda6fb2e8f1ff896f12d05c8e74dcf7e 100644 (file)
--- 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 c03edd46c5093c24f2a123fd2d77f07333a02cd1..a76ea8dd3183c59c8332061fd48d6f98b02d7787 100644 (file)
--- 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