From fcfd16cbc3148f15e53956a8fece6e67a2023652 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 2 Apr 2013 19:00:02 +0100 Subject: [PATCH] Do not explicitly link libfolks-internal.la into things libfolks.la embeds a copy of libfolks-internal.la, so every public (or internal) symbol in libfolks-internal.la is available in libfolks.la, even if linked with -Wl,--no-copy-dt-needed-entries. If libfolks-internal.la defines a GObject type, then linking two copies of it is actively harmful, because they can't both be registered with the type system. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687161 Signed-off-by: Simon McVittie Reviewed-by: Philip Withnall --- backends/eds/Makefile.am | 1 - backends/eds/lib/Makefile.am | 1 - backends/key-file/Makefile.am | 1 - backends/libsocialweb/Makefile.am | 1 - backends/ofono/Makefile.am | 1 - backends/telepathy/Makefile.am | 1 - backends/telepathy/lib/Makefile.am | 1 - backends/tracker/Makefile.am | 1 - backends/tracker/lib/Makefile.am | 1 - 9 files changed, 9 deletions(-) diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am index 3bdcc03..4d31659 100644 --- a/backends/eds/Makefile.am +++ b/backends/eds/Makefile.am @@ -56,7 +56,6 @@ eds_la_LIBADD = \ $(AM_LIBADD) \ $(top_builddir)/backends/eds/lib/libfolks-eds.la \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am index 83d5ae4..c5a969c 100644 --- a/backends/eds/lib/Makefile.am +++ b/backends/eds/lib/Makefile.am @@ -74,7 +74,6 @@ libfolks_eds_la_CFLAGS = \ libfolks_eds_la_LIBADD = \ $(AM_LIBADD) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(EBOOK_LIBS) \ $(EDATASERVER_LIBS) \ $(GIO_LIBS) \ diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am index 1cdcda2..a50110f 100644 --- a/backends/key-file/Makefile.am +++ b/backends/key-file/Makefile.am @@ -45,7 +45,6 @@ key_file_la_LIBADD = \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(NULL) key_file_la_LDFLAGS = \ diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am index eb051b5..1e52276 100644 --- a/backends/libsocialweb/Makefile.am +++ b/backends/libsocialweb/Makefile.am @@ -54,7 +54,6 @@ libsocialweb_la_LIBADD = \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(SW_CLIENT_LIBS) \ lib/libfolks-libsocialweb.la \ $(NULL) diff --git a/backends/ofono/Makefile.am b/backends/ofono/Makefile.am index 1a9a210..0877de5 100644 --- a/backends/ofono/Makefile.am +++ b/backends/ofono/Makefile.am @@ -54,7 +54,6 @@ ofono_la_LIBADD = \ $(GEE_LIBS) \ $(EBOOK_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(NULL) ofono_la_LDFLAGS = \ diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am index 899f54e..d96312c 100644 --- a/backends/telepathy/Makefile.am +++ b/backends/telepathy/Makefile.am @@ -57,7 +57,6 @@ telepathy_la_LIBADD = \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(TP_GLIB_LIBS) \ lib/libfolks-telepathy.la \ $(NULL) diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index 02de1b7..b9699dd 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -157,7 +157,6 @@ libfolks_telepathy_la_LIBADD = \ $(TP_GLIB_LIBS) \ $(ZEITGEIST_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(NULL) # The quoting here is unnecessary but harmless, and has the useful side-effect diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am index aeaa047..c0f2965 100644 --- a/backends/tracker/Makefile.am +++ b/backends/tracker/Makefile.am @@ -55,7 +55,6 @@ tracker_la_LIBADD = \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(TRACKER_SPARQL_LIBS) \ $(top_builddir)/backends/tracker/lib/libfolks-tracker.la \ $(NULL) diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am index 3188970..c44fe00 100644 --- a/backends/tracker/lib/Makefile.am +++ b/backends/tracker/lib/Makefile.am @@ -67,7 +67,6 @@ libfolks_tracker_la_LIBADD = \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ - $(top_builddir)/folks/libfolks-internal.la \ $(TRACKER_SPARQL_LIBS) \ $(NULL) -- 2.7.4