[Mesa-dev] [PATCH 1/4] automake: loader: rework the CPPFLAGS

[Kai Wasserbäch]

Hey Emil,
you can have my
  Tested-by: Kai Wasserbäch <kai at dev.carbon-project.org>
for the series.

I just did a build (amd64 and i386) and didn't see the additional symbols show
up again.

Thanks for taking care of this!

Cheers,
Kai


Emil Velikov wrote on 19.11.2015 17:33:
> From: Emil Velikov <emil.velikov at 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 <kai at dev.carbon-project.org>
> Reported-by: Kai Wasserbäch <kai at dev.carbon-project.org>
> Signed-off-by: Emil Velikov <emil.velikov at 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
> 

-- 

Kai Wasserbäch (Kai Wasserbaech)

E-Mail: kai at dev.carbon-project.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 630 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20151119/09745c3f/attachment.sig>