From 73b0adfe0aa84cee46db760f9ebb3fbb03b9655a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 28 Jan 2016 15:00:30 +0100 Subject: [PATCH] Hide non-public symbols from libglnx and libxdgapp-common This avoids exporting glnx_*, calc_sizes(), etc. However, we do want to export xdg_app_error_quark(), so do that. Signed-off-by: Simon McVittie --- Makefile.am | 6 +++++- common/Makefile.am.inc | 10 +++++++++- common/xdg-app-portal-error.h | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 83e5774f..bb3c5b17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,11 @@ EXTRA_DIST = lib_LTLIBRARIES = noinst_LTLIBRARIES = libglnx.la libglnx_srcpath := $(srcdir)/libglnx -libglnx_cflags := $(BASE_CFLAGS) "-I$(libglnx_srcpath)" +libglnx_cflags := \ + $(BASE_CFLAGS) \ + "-I$(libglnx_srcpath)" \ + $(HIDDEN_VISIBILITY_CFLAGS) \ + $(NULL) libglnx_libs := $(BASE_LIBS) include libglnx/Makefile-libglnx.am.inc diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc index 7ce7e840..8d28c73a 100644 --- a/common/Makefile.am.inc +++ b/common/Makefile.am.inc @@ -43,7 +43,15 @@ libxdgapp_common_la_SOURCES = \ $(systemd_dbus_built_sources) \ $(NULL) -libxdgapp_common_la_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(XAUTH_CFLAGS) -I$(srcdir)/dbus-proxy +libxdgapp_common_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(BASE_CFLAGS) \ + $(HIDDEN_VISIBILITY_CFLAGS) \ + $(OSTREE_CFLAGS) \ + $(SOUP_CFLAGS) \ + $(XAUTH_CFLAGS) \ + -I$(srcdir)/dbus-proxy \ + $(NULL) libxdgapp_common_la_LIBADD = libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(XAUTH_LIBS) bin_PROGRAMS += \ diff --git a/common/xdg-app-portal-error.h b/common/xdg-app-portal-error.h index 4ae8ddbe..ad7812ca 100644 --- a/common/xdg-app-portal-error.h +++ b/common/xdg-app-portal-error.h @@ -42,7 +42,7 @@ typedef enum { #define XDG_APP_PORTAL_ERROR xdg_app_error_quark() -GQuark xdg_app_error_quark (void); +XDG_APP_EXTERN GQuark xdg_app_error_quark (void); G_END_DECLS