summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2012-11-05 12:11:13 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2012-11-07 18:50:45 +0000
commit6838ee9b2a7ac7a2366a6570dc1abc7a711d9440 (patch)
tree26f0e17eb8fa510cf712b3321dcf9a2ce4370947
parent2b8e9ef835f1e99ff791bd5d5ec579e470465f46 (diff)
downloadjson-glib-6838ee9b2a7ac7a2366a6570dc1abc7a711d9440.tar.gz
build: Use the symbols file to generate our public ABI
Instead of a regular expression. This allows us to catch ABI issues immediately, without using the ABI check, while building JSON-GLib, even on *nix.
-rw-r--r--json-glib/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index 0b84d74..b65fdd9 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -78,7 +78,9 @@ lib_LTLIBRARIES = libjson-glib-1.0.la
libjson_glib_1_0_la_LIBADD = $(JSON_LIBS)
libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
-libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -no-undefined -export-symbols $(top_srcdir)/json-glib/json-glib.symbols -rpath $(libdir)
+
+EXTRA_DIST += json-glib.symbols
jsonincludedir = $(includedir)/json-glib-1.0/json-glib
jsoninclude_DATA = \
@@ -123,8 +125,6 @@ typelibs_DATA = Json-1.0.typelib
CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
-EXTRA_DIST += json-glib.symbols
-
dist-hook: ../build/win32/vs9/json-glib.vcproj ../build/win32/vs10/json-glib.vcxproj ../build/win32/vs10/json-glib.vcxproj.filters
../build/win32/vs9/json-glib.vcproj: $(top_srcdir)/build/win32/vs9/json-glib.vcprojin