summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-11-22 22:05:00 +0000
committerEmil Velikov <[email protected]>2015-11-23 12:07:50 +0000
commitb9b0a1f58e41ba4027a16300393835dc8c632f50 (patch)
treeb4ffb3e503814c80324838a34cfe7ba6e6b3b45a /src
parent8a6d4765880a2c9000970b2b6e584291090b1dc3 (diff)
loader: unconditionally add AM_CPPFLAGS to libloader_la_CPPFLAGS
It seems that due to the conditional autotools is getting confused and forgetting to add AM_CPPFLAGS when building libloader (when HAVE_DRICOMMON is not set). Cc: [email protected] Fixes: 5a79e0a8e37 "automake: loader: rework the CPPFLAGS" Reported-by: Pali Rohár <[email protected]> Tested-by: Pali Rohár <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/loader/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 5021120c96d..9ca17540d54 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -34,12 +34,12 @@ AM_CPPFLAGS = \
$(LIBDRM_CFLAGS) \
$(LIBUDEV_CFLAGS)
+libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
libloader_la_SOURCES = $(LOADER_C_FILES)
libloader_la_LIBADD =
if HAVE_DRICOMMON
-libloader_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
+libloader_la_CPPFLAGS += \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/ \