Hello, Without this change, the build would pick the system-wide libdrm, not the one given to the configure script (through PKG_CONFIG_PATH for instance).
-- Jean-Sébastien Pédron
From 08d12cdfd4d653cebaf30cec4a2b1e970ecef0d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= <dumbb...@freebsd.org> Date: Wed, 5 Jun 2013 13:38:09 +0200 Subject: [PATCH 4/9] Add $(LIBDRM_CFLAGS) in CPPFLAGS where it's missing Without this change, the build would pick the system-wide libdrm, not the one given to the configure script (through PKG_CONFIG_PATH for instance). --- src/gallium/drivers/freedreno/Makefile.am | 1 + src/gallium/drivers/i915/Makefile.am | 3 ++- src/gallium/drivers/ilo/Makefile.am | 3 ++- src/gallium/drivers/nv30/Makefile.am | 1 + src/gallium/drivers/nv50/Makefile.am | 1 + src/gallium/drivers/nvc0/Makefile.am | 1 + src/gallium/drivers/r300/Makefile.am | 1 + src/gallium/drivers/r600/Makefile.am | 1 + src/gallium/drivers/radeon/Makefile.am | 2 +- src/gallium/drivers/radeonsi/Makefile.am | 3 ++- src/mesa/drivers/dri/i915/Makefile.am | 1 + 11 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am index dde0cf1..25bee2d 100644 --- a/src/gallium/drivers/freedreno/Makefile.am +++ b/src/gallium/drivers/freedreno/Makefile.am @@ -6,6 +6,7 @@ AM_CFLAGS = \ -Wno-packed-bitfield-compat \ -I$(top_srcdir)/src/gallium/drivers \ $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ $(FREEDRENO_CFLAGS) \ $(PIC_FLAGS) \ $(VISIBILITY_CFLAGS) diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am index 4e6f464..65d249d 100644 --- a/src/gallium/drivers/i915/Makefile.am +++ b/src/gallium/drivers/i915/Makefile.am @@ -28,6 +28,7 @@ noinst_LTLIBRARIES = libi915.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ - $(GALLIUM_CFLAGS) + $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) libi915_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/ilo/Makefile.am b/src/gallium/drivers/ilo/Makefile.am index 161b38c..598f3d6 100644 --- a/src/gallium/drivers/ilo/Makefile.am +++ b/src/gallium/drivers/ilo/Makefile.am @@ -29,7 +29,8 @@ noinst_LTLIBRARIES = libilo.la AM_CPPFLAGS = \ -I$(srcdir)/include \ -I$(top_srcdir)/src/gallium/winsys/intel/drm \ - $(GALLIUM_CFLAGS) + $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) AM_CFLAGS = \ $(VISIBILITY_CFLAGS) diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am index e7d1983..b168460 100644 --- a/src/gallium/drivers/nv30/Makefile.am +++ b/src/gallium/drivers/nv30/Makefile.am @@ -29,6 +29,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ $(NOUVEAU_CFLAGS) libnv30_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/nv50/Makefile.am b/src/gallium/drivers/nv50/Makefile.am index 58c26ef..6be5678 100644 --- a/src/gallium/drivers/nv50/Makefile.am +++ b/src/gallium/drivers/nv50/Makefile.am @@ -29,6 +29,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ $(NOUVEAU_CFLAGS) libnv50_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) diff --git a/src/gallium/drivers/nvc0/Makefile.am b/src/gallium/drivers/nvc0/Makefile.am index 45e5a63..735ebc2 100644 --- a/src/gallium/drivers/nvc0/Makefile.am +++ b/src/gallium/drivers/nvc0/Makefile.am @@ -29,6 +29,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ $(NOUVEAU_CFLAGS) libnvc0_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index 49264c4..96e4dc6 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -14,6 +14,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mapi \ $(VISIBILITY_CFLAGS) \ $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ $(LLVM_CFLAGS) \ $(RADEON_CFLAGS) diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index 9203d03..534d23e 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) \ $(RADEON_CFLAGS) \ $(VISIBILITY_CFLAGS) diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index ac8cbd3..a56f332 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -5,7 +5,7 @@ LIBGALLIUM_LIBS= noinst_LTLIBRARIES = libradeon.la -AM_CFLAGS = $(GALLIUM_CFLAGS) $(RADEON_CFLAGS) +AM_CFLAGS = $(GALLIUM_CFLAGS) $(LIBDRM_CFLAGS) $(RADEON_CFLAGS) libradeon_la_SOURCES = \ $(C_SOURCES) diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am index 46aa998..1cd85c4 100644 --- a/src/gallium/drivers/radeonsi/Makefile.am +++ b/src/gallium/drivers/radeonsi/Makefile.am @@ -29,7 +29,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers/radeon \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ - $(GALLIUM_CFLAGS) + $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) AM_CFLAGS = $(LLVM_CFLAGS) libradeonsi_la_SOURCES = $(C_SOURCES) diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 9501719..a517ab3 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -23,6 +23,7 @@ include Makefile.sources +AM_CPPFLAGS = $(LIBDRM_CFLAGS) AM_CFLAGS = \ -DI915 \ -I$(top_srcdir)/include \ -- 1.8.3.1
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
