Signed-off-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
---
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 6c67d27084c..b47a01e798f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1827,7 +1827,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"
@@ -2415,7 +2415,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 8cb40f27d44..73ef8101d1c 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 5f629a29827..1506fc8a10d 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 82c477d68b6..f7f11806492 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 e85fb9d5486..feead3eb2d2 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)
--
2.11.0
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
