summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2017-06-15 12:28:07 +0100
committerLionel Landwerlin <[email protected]>2017-06-27 14:10:29 +0300
commit3c50ebce259f63392122a6ace32d07055e0bff1a (patch)
tree4ae69a784361481ac8514e9a034f9b838d49e3fd /src
parent230691b8e5520401cc8eeffcf4f6c9e114c34635 (diff)
i915: use different CFLAGS/LIBS variables than i965/anv
Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/i915/Automake.inc2
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am2
-rw-r--r--src/gallium/winsys/i915/drm/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.am4
4 files changed, 5 insertions, 5 deletions
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 e06d93213f3..6b116184f5b 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)