From: Emil Velikov <emil.veli...@collabora.com>
Rather than duplicating things, just use the generic AM_CPPFLAGS. This
has the fortunate side-effect of adding VISIBILITY_CFLAGS for the dri3
helper. The latter of which was erroneously exposing some internal
symbols.
Cc: Kai Wasserbäch <k...@dev.carbon-project.org>
Reported-by: Kai Wasserbäch <k...@dev.carbon-project.org>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
src/loader/Makefile.am | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index c0f7947..67ed776 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -25,18 +25,20 @@ EXTRA_DIST = SConscript
noinst_LTLIBRARIES = libloader.la libloader_dri3_helper.la
-libloader_la_CPPFLAGS = \
+AM_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
$(VISIBILITY_CFLAGS) \
+ $(LIBDRM_CFLAGS) \
$(LIBUDEV_CFLAGS)
libloader_la_SOURCES = $(LOADER_C_FILES)
libloader_la_LIBADD =
if HAVE_DRICOMMON
-libloader_la_CPPFLAGS += \
+libloader_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/ \
@@ -49,20 +51,11 @@ libloader_la_CPPFLAGS += \
endif
if HAVE_LIBDRM
-libloader_la_CPPFLAGS += \
- $(LIBDRM_CFLAGS)
-
libloader_la_LIBADD += \
$(LIBDRM_LIBS)
endif
if HAVE_DRI3
-libloader_dri3_helper_la_CPPFLAGS = \
- $(DEFINES) \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src \
- $(LIBDRM_CFLAGS)
-
libloader_dri3_helper_la_SOURCES = \
loader_dri3_helper.c \
loader_dri3_helper.h
--
2.6.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
