From 5ded457959525e6f875e83225967443f54f679b7 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Sat, 7 Mar 2009 13:39:04 +0000 Subject: Based on patch by: Christopher Taylor 2009-03-07 Jens Granseuer Based on patch by: Christopher Taylor * gnome-settings-daemon/Makefile.am: * plugins/a11y-keyboard/Makefile.am: * plugins/background/Makefile.am: * plugins/clipboard/Makefile.am: * plugins/dummy/Makefile.am: * plugins/font/Makefile.am: * plugins/housekeeping/Makefile.am: * plugins/keybindings/Makefile.am: * plugins/keyboard/Makefile.am: * plugins/media-keys/Makefile.am: * plugins/mouse/Makefile.am: * plugins/screensaver/Makefile.am: * plugins/sound/Makefile.am: * plugins/typing-break/Makefile.am: * plugins/xrandr/Makefile.am: * plugins/xrdb/Makefile.am: * plugins/xsettings/Makefile.am: make build work with -Wl,-z,defs linker options (bug #574452) svn path=/trunk/; revision=763 --- gnome-settings-daemon/Makefile.am | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnome-settings-daemon/Makefile.am') diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am index 51c5bdab..ad3b1ffd 100644 --- a/gnome-settings-daemon/Makefile.am +++ b/gnome-settings-daemon/Makefile.am @@ -11,27 +11,28 @@ INCLUDES = \ $(NULL) noinst_LTLIBRARIES = \ - libgsd-profile.la \ + libgsd-plugins.la \ $(NULL) -libgsd_profile_la_SOURCES = \ +libgsd_plugins_la_SOURCES = \ + gnome-settings-plugin.c \ + gnome-settings-plugin.h \ gnome-settings-profile.c \ gnome-settings-profile.h \ $(NULL) -libgsd_profile_la_CPPFLAGS = \ +libgsd_plugins_la_CPPFLAGS = \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) -libgsd_profile_la_CFLAGS = \ - $(SIMPLE_GREETER_CFLAGS) \ +libgsd_plugins_la_CFLAGS = \ $(NULL) -libgsd_profile_la_LIBADD = \ +libgsd_plugins_la_LIBADD = \ $(NULL) -libgsd_profile_la_LDFLAGS = \ - -export-dynamic \ +libgsd_plugins_la_LDFLAGS = \ + -export-dynamic \ $(NULL) gsddir = $(libexecdir) @@ -59,8 +60,6 @@ gnome_settings_daemon_SOURCES = \ main.c \ gnome-settings-manager.c \ gnome-settings-manager.h \ - gnome-settings-plugin.c \ - gnome-settings-plugin.h \ gnome-settings-plugin-info.c \ gnome-settings-plugin-info.h \ gnome-settings-module.c \ @@ -77,7 +76,7 @@ gnome_settings_daemon_LDFLAGS = \ $(AM_LDFLAGS) gnome_settings_daemon_LDADD = \ - libgsd-profile.la \ + libgsd-plugins.la \ $(SETTINGS_DAEMON_LIBS) EXTRA_DIST = \ -- cgit v1.2.1