Fix visibility for glib/ and gio/ submodules

We have various sub directories in glib/ and gio/ (eg: inotify, gnulib,
pcre, xdgmime, etc.) that build convenience libraries that are then
included into libglib and libgio.  The files in these directories need
to be built with the same visibility policy as the files in the first
level directories, so add CFLAGS for them all.

This wasn't a problem when the visibility flags were set directly in
CFLAGS but then we had to deal with some modules that we built that we
explicitly wanted to export symbols from.

For now, we can keep things the way they are because it's less hacky and
although it's a theoretical hazard to forget these CFLAGS, we rarely add
new subdirectories to the build.

diff --git a/gio/fen/Makefile.am b/gio/fen/Makefile.am
index 52af1cf..0a22a64 100644 (file)
--- a/gio/fen/Makefile.am
+++ b/gio/fen/Makefile.am
@@ -20,6 +20,7 @@ libfen_la_SOURCES =           \
        $(NULL)
 
 libfen_la_CFLAGS = \
+       $(GLIB_HIDDEN_VISIBILITY_CFLAGS)        \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
        $(gio_INCLUDES)                         \
        $(GLIB_DEBUG_FLAGS)             \

diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am
index 2235126..b51a0a9 100644 (file)
--- a/gio/inotify/Makefile.am
+++ b/gio/inotify/Makefile.am
@@ -22,6 +22,7 @@ libinotify_la_SOURCES =               \
        $(NULL)
 
 libinotify_la_CFLAGS = \
+       $(GLIB_HIDDEN_VISIBILITY_CFLAGS)        \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
        $(gio_INCLUDES)                 \
        $(GLIB_DEBUG_FLAGS)             \

diff --git a/gio/kqueue/Makefile.am b/gio/kqueue/Makefile.am
index 40fd1fe..652c43e 100644 (file)
--- a/gio/kqueue/Makefile.am
+++ b/gio/kqueue/Makefile.am
@@ -26,6 +26,7 @@ libkqueue_la_SOURCES = \
        $(NULL)
 
 libkqueue_la_CFLAGS = \
+       $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
        -DG_LOG_DOMAIN=\"GLib-GIO\" \
        $(gio_INCLUDES) \
        $(GLIB_DEBUG_FLAGS) \

diff --git a/gio/win32/Makefile.am b/gio/win32/Makefile.am
index 6f85a15..b75bc36 100644 (file)
--- a/gio/win32/Makefile.am
+++ b/gio/win32/Makefile.am
@@ -19,6 +19,7 @@ libgiowin32_la_SOURCES =                      \
        $(NULL)
 
 libgiowin32_la_CFLAGS = \
+       $(GLIB_HIDDEN_VISIBILITY_CFLAGS)        \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
        $(gio_INCLUDES)                 \
        $(GLIB_DEBUG_FLAGS)             \

diff --git a/gio/xdgmime/Makefile.am b/gio/xdgmime/Makefile.am
index 8078344..fa39d05 100644 (file)
--- a/gio/xdgmime/Makefile.am
+++ b/gio/xdgmime/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = -DXDG_PREFIX=_gio_xdg
 
 noinst_LTLIBRARIES = libxdgmime.la
 
+libxdgmime_la_CFLAGS = $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 libxdgmime_la_SOURCES = \
        xdgmime.c       \
        xdgmime.h       \

diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index ae8283d..8ad4889 100644 (file)
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = $(glib_INCLUDES) -DG_LOG_DOMAIN=\"GLib\" \
 
 noinst_LTLIBRARIES = libgnulib.la
 
+libgnulib_la_CFLAGS = $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 libgnulib_la_SOURCES =         \
        asnprintf.c \
        printf-args.c \

diff --git a/glib/libcharset/Makefile.am b/glib/libcharset/Makefile.am
index f5362df..0dd4f50 100644 (file)
--- a/glib/libcharset/Makefile.am
+++ b/glib/libcharset/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES =                      \
 
 noinst_LTLIBRARIES = libcharset.la
 
+libcharset_la_CFLAGS = $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 libcharset_la_SOURCES =        \
        libcharset.h            \
        localcharset.h          \

diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am
index 1148a92..53669a0 100644 (file)
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@@ -25,6 +25,7 @@ libpcre_la_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 libpcre_la_CFLAGS = \
+       $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
        $(PCRE_WARN_CFLAGS) \
        $(DEP_CFLAGS) \
        $(AM_CFLAGS)