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

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

diff --git a/configure.ac b/configure.ac
index 9de1b4293319715c7baec74e7de7bae18a67d9a9..ce9e4ffdfd7eb9eb9df874667516cb561b1266a8 100644 (file)
--- 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 8cb40f27d44bdd9071c3dcaf4634b68a9b4954c4..73ef8101d1c819631ee2c4fa3bdd965f6b613415 100644 (file)
--- 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 e06d93213f3b5bf0f29a9f5258d301bc0e785c0c..6b116184f5b4861e22c31d844394912f3d45e178 100644 (file)
--- 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 82c477d68b6109acc4507f8387e3c32327bce3a8..f7f11806492b8a5deb4a88219d15e279032cbf06 100644 (file)
--- 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 e85fb9d5486d36243147bc302108b1db979f95a1..feead3eb2d2c95118f0cae793af952bd46160a53 100644 (file)
--- 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)