Unify libgsd-profile and libgsd-session into installed shared library

Currently plugins can call back into the main binary; if the program
is linked with -Bsymbolic then what happens is the plugin process will
contain duplicate functions from libgsd-session.la.

Ubuntu has patched their toolchain to link with -Bsymbolic-functions
by default which causes a failure here.

This is also just cleaner and better; there's only one copy of the
code on disk.

https://bugzilla.gnome.org/show_bug.cgi?id=670244

8 files changed, 16 insertions, 37 deletions

diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index 4868fef..da06092 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -14,47 +14,28 @@ INCLUDES = \
 	$(SYSTEMD_CFLAGS)					\
 	$(NULL)
 
-noinst_LTLIBRARIES = 			\
-	libgsd-profile.la		\
-	libgsd-session.la		\
+pkglib_LTLIBRARIES = 			\
+	libgsd.la		\
 	$(NULL)
 
-libgsd_profile_la_SOURCES =		\
+libgsd_la_SOURCES =		\
 	gnome-settings-profile.c	\
 	gnome-settings-profile.h	\
-	$(NULL)
-
-libgsd_profile_la_CPPFLAGS = 		\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
-	$(NULL)
-
-libgsd_profile_la_CFLAGS =		\
-	$(SIMPLE_GREETER_CFLAGS)	\
-	$(NULL)
-
-libgsd_profile_la_LIBADD =		\
-	$(NULL)
-
-libgsd_profile_la_LDFLAGS = 	\
-	-export-dynamic 	\
-	$(NULL)
-
-libgsd_session_la_SOURCES =		\
 	gnome-settings-session.c	\
 	gnome-settings-session.h	\
 	$(NULL)
 
-libgsd_session_la_CPPFLAGS = 		\
+libgsd_la_CPPFLAGS = 		\
 	$(DISABLE_DEPRECATED_CFLAGS)	\
 	$(NULL)
 
-libgsd_session_la_CFLAGS =		\
+libgsd_la_CFLAGS =		\
 	$(NULL)
 
-libgsd_session_la_LIBADD =		\
+libgsd_la_LIBADD =		\
 	$(NULL)
 
-libgsd_session_la_LDFLAGS = 	\
+libgsd_la_LDFLAGS = 	\
 	-export-dynamic 	\
 	$(NULL)
 
@@ -92,8 +73,7 @@ gnome_settings_daemon_LDFLAGS = 	\
 	$(AM_LDFLAGS)
 
 gnome_settings_daemon_LDADD = 		\
-	libgsd-profile.la		\
-	libgsd-session.la		\
+	libgsd.la		\
 	$(SETTINGS_DAEMON_LIBS)		\
 	$(LIBNOTIFY_LIBS)		\
 	$(UPOWER_LIBS)			\
diff --git a/plugins/automount/Makefile.am b/plugins/automount/Makefile.am
index 176daab..d5f3ea8 100644
--- a/plugins/automount/Makefile.am
+++ b/plugins/automount/Makefile.am
@@ -21,8 +21,7 @@ gnome_fallback_mount_helper_LDADD =	\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(SYSTEMD_LIBS)			\
 	$(AUTOMOUNT_LIBS)		\
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la \
-	$(top_builddir)/gnome-settings-daemon/libgsd-session.la
+	$(top_builddir)/gnome-settings-daemon/libgsd.la
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = gnome-fallback-mount-helper.desktop.in
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index f3bca03..50e03bf 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -24,7 +24,7 @@ test_background_CFLAGS = \
 	$(AM_CFLAGS)
 
 test_background_LDADD =		\
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la	\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(BACKGROUND_LIBS)	\
 	$(NULL)
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 980624c..dbb325f 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -33,7 +33,7 @@ libcolor_la_LDFLAGS = 			\
 	$(GSD_PLUGIN_LDFLAGS)
 
 libcolor_la_LIBADD  = 			\
-	$(top_builddir)/gnome-settings-daemon/libgsd-session.la	\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
 	$(COLOR_LIBS)			\
 	$(LCMS_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)		\
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index b14e60b..3fef8b5 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -126,7 +126,7 @@ test_media_keys_CFLAGS = \
 	$(AM_CFLAGS)
 
 test_media_keys_LDADD = \
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la		\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
 	$(SETTINGS_DAEMON_LIBS)			\
diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am
index 9a825de..6448e91 100644
--- a/plugins/orientation/Makefile.am
+++ b/plugins/orientation/Makefile.am
@@ -18,7 +18,7 @@ test_orientation_CFLAGS =					\
 	$(AM_CFLAGS)
 
 test_orientation_LDADD =						\
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la		\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(GUDEV_LIBS)							\
 	$(SETTINGS_PLUGIN_LIBS)
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 0c90b7f..eebc067 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -38,7 +38,7 @@ libpower_la_LDFLAGS = 					\
 
 libpower_la_LIBADD  = 					\
 	$(top_builddir)/plugins/common/libcommon.la	\
-	$(top_builddir)/gnome-settings-daemon/libgsd-session.la \
+	$(top_builddir)/gnome-settings-daemon/libgsd.la \
 	$(UPOWER_LIBS)					\
 	$(GNOME_DESKTOP_LIBS)				\
 	$(KEYRING_LIBS)					\
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 02c9f3b..375f107 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -57,7 +57,7 @@ test_wacom_CFLAGS =			\
 	$(AM_CFLAGS)
 
 test_wacom_LDADD = \
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la		\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
@@ -85,7 +85,7 @@ list_wacom_CFLAGS =			\
 	$(AM_CFLAGS)
 
 list_wacom_LDADD = \
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la		\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\