gmodule: Two minor g-i annotations fixes

[platform/upstream/glib.git] / gmodule / Makefile.am

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 19737fa..6acd846 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/glib.mk
 
 AM_CPPFLAGS =                          \
        $(glib_INCLUDES)                \
@@ -7,10 +7,11 @@ AM_CPPFLAGS =                                 \
        @GLIB_DEBUG_FLAGS@              \
        -DG_DISABLE_DEPRECATED
 
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
+
 EXTRA_DIST +=                          \
                makefile.msc.in         \
                gmoduleconf.h.in        \
-               gmodule.symbols         \
                gmodule-dl.c            \
                gmodule-dld.c           \
                gmodule-dyld.c          \
@@ -21,11 +22,11 @@ EXTRA_DIST +=                               \
                gmoduleconf.h.win32     \
                gmodule.rc.in
 
-BUILT_EXTRA_DIST = \
+BUILT_EXTRA_DIST += \
                makefile.msc    \
                gmodule.rc
 
-BUILT_SOURCES = gmoduleconf.h
+BUILT_SOURCES += gmoduleconf.h
 gmoduleconf.h: gmoduleconf.h.in
 
 glibincludedir=$(includedir)/glib-2.0
@@ -40,7 +41,7 @@ lib_LTLIBRARIES = libgmodule-2.0.la
 
 if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
-noinst_DATA = gmodule-2.0.lib
+noinst_DATA += gmodule-2.0.lib
 
 install_ms_lib_cmd = $(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
 uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
@@ -62,12 +63,13 @@ gmodule_win32_res = gmodule-win32-res.o
 gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res)
 endif
 
+libgmodule_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 libgmodule_2_0_la_SOURCES = gmodule.c
 libgmodule_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
        $(gmodule_win32_res_ldflag) \
        $(G_MODULE_LDFLAGS) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -export-dynamic $(no_undefined) $(export_symbols)
+       -export-dynamic $(no_undefined)
 
 libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib)