KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automake: loader: rework the CPPFLAGS 

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.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reported-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Tested-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov 2015-11-19 15:31:06 +00:00 committed by Emil Velikov
parent 99840eb983
commit 5a79e0a8e3
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/loader/Makefile.am
View File

@ -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