diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2015-11-19 15:31:06 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-11-20 10:40:11 +0000 |
| commit | 5a79e0a8e37ea10cfa6fc39f4fbe315f9620fe52 (patch) | |
| tree | 2b93bd25f1dc0ed49221fa311190b82cce1cd7f4 | |
| parent | 99840eb983f74cd447546f7205c8c9f505ef82c8 (diff) | |
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>
| -rw-r--r-- | src/loader/Makefile.am | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am index c0f7947536..67ed776b0c 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 |