Mesa (master): i915: use different CFLAGS/LIBS variables than i965/anv

[Lionel Landwerlin]

Module: Mesa
Branch: master
Commit: 3c50ebce259f63392122a6ace32d07055e0bff1a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c50ebce259f63392122a6ace32d07055e0bff1a

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Jun 15 12:28:07 2017 +0100

i915: use different CFLAGS/LIBS variables than i965/anv

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 configure.ac                                | 4 ++--
 src/gallium/drivers/i915/Automake.inc       | 2 +-
 src/gallium/targets/pipe-loader/Makefile.am | 2 +-
 src/gallium/winsys/i915/drm/Makefile.am     | 2 +-
 src/mesa/drivers/dri/i915/Makefile.am       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9de1b42933..ce9e4ffdfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1830,7 +1830,7 @@ if test -n "$with_dri_drivers"; then
         xi915)
             require_libdrm "i915"
             HAVE_I915_DRI=yes
-            PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
+            PKG_CHECK_MODULES([I915], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
             ;;
         xi965)
             require_libdrm "i965"
@@ -2418,7 +2418,7 @@ if test -n "$with_gallium_drivers"; then
             ;;
         xi915)
             HAVE_GALLIUM_I915=yes
-            PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
+            PKG_CHECK_MODULES([I915], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
             require_libdrm "Gallium i915"
             ;;
         xr300)
diff --git a/src/gallium/drivers/i915/Automake.inc b/src/gallium/drivers/i915/Automake.inc
index 8cb40f27d4..73ef8101d1 100644
--- a/src/gallium/drivers/i915/Automake.inc
+++ b/src/gallium/drivers/i915/Automake.inc
@@ -5,7 +5,7 @@ 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) \
+	$(I915_LIBS) \
 	$(LIBDRM_LIBS)
 
 endif
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index e06d93213f..6b116184f5 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -86,7 +86,7 @@ pipe_i915_la_LIBADD = \
 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
 	$(top_builddir)/src/gallium/drivers/i915/libi915.la \
 	$(LIBDRM_LIBS) \
-	$(INTEL_LIBS)
+	$(I915_LIBS)
 
 endif
 
diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
index 82c477d68b..f7f1180649 100644
--- a/src/gallium/winsys/i915/drm/Makefile.am
+++ b/src/gallium/winsys/i915/drm/Makefile.am
@@ -26,7 +26,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
 	-I$(top_srcdir)/src/gallium/drivers \
 	$(GALLIUM_WINSYS_CFLAGS) \
-	$(INTEL_CFLAGS)
+	$(I915_CFLAGS)
 
 noinst_LTLIBRARIES = libi915drm.la
 
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index e85fb9d548..feead3eb2d 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -34,8 +34,8 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
 	$(VISIBILITY_CFLAGS) \
-	$(INTEL_CFLAGS)
+	$(I915_CFLAGS)
 
 noinst_LTLIBRARIES = libi915_dri.la
 libi915_dri_la_SOURCES = $(i915_FILES)
-libi915_dri_la_LIBADD = $(INTEL_LIBS)
+libi915_dri_la_LIBADD = $(I915_LIBS)