summaryrefslogtreecommitdiff
path: root/gnome-settings-daemon
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2009-03-18 21:14:57 +0000
committerJens Granseuer <jensg@src.gnome.org>2009-03-18 21:14:57 +0000
commitb714ad4dd5c45cca6b1ad052aaf81d6b2d8df9e5 (patch)
treede2079b17c1d5f898653849fcb2f50afc5a92fc3 /gnome-settings-daemon
parentcaa288ed3cdb63a7672dbdcab05f733b70948f40 (diff)
downloadgnome-settings-daemon-b714ad4dd5c45cca6b1ad052aaf81d6b2d8df9e5.tar.gz
revert build patch from r763
2009-03-18 Jens Granseuer <jensgr@gmx.net> * 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: revert build patch from r763 svn path=/trunk/; revision=793
Diffstat (limited to 'gnome-settings-daemon')
-rw-r--r--gnome-settings-daemon/Makefile.am21
1 files changed, 11 insertions, 10 deletions
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index ad3b1ffd..51c5bdab 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -11,28 +11,27 @@ INCLUDES = \
$(NULL)
noinst_LTLIBRARIES = \
- libgsd-plugins.la \
+ libgsd-profile.la \
$(NULL)
-libgsd_plugins_la_SOURCES = \
- gnome-settings-plugin.c \
- gnome-settings-plugin.h \
+libgsd_profile_la_SOURCES = \
gnome-settings-profile.c \
gnome-settings-profile.h \
$(NULL)
-libgsd_plugins_la_CPPFLAGS = \
+libgsd_profile_la_CPPFLAGS = \
$(DISABLE_DEPRECATED_CFLAGS) \
$(NULL)
-libgsd_plugins_la_CFLAGS = \
+libgsd_profile_la_CFLAGS = \
+ $(SIMPLE_GREETER_CFLAGS) \
$(NULL)
-libgsd_plugins_la_LIBADD = \
+libgsd_profile_la_LIBADD = \
$(NULL)
-libgsd_plugins_la_LDFLAGS = \
- -export-dynamic \
+libgsd_profile_la_LDFLAGS = \
+ -export-dynamic \
$(NULL)
gsddir = $(libexecdir)
@@ -60,6 +59,8 @@ 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 \
@@ -76,7 +77,7 @@ gnome_settings_daemon_LDFLAGS = \
$(AM_LDFLAGS)
gnome_settings_daemon_LDADD = \
- libgsd-plugins.la \
+ libgsd-profile.la \
$(SETTINGS_DAEMON_LIBS)
EXTRA_DIST = \