[gnome-settings-daemon] plugins: Stop building helpers as plugins



commit 6d01a434ca2faa88acb2aed1224d23cea329f1f8
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 26 19:02:22 2016 +0200

    plugins: Stop building helpers as plugins
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772370

 configure.ac                                       |    3 -
 plugins/a11y-keyboard/Makefile.am                  |   43 -----------
 .../a11y-keyboard.gnome-settings-plugin.in         |    9 ---
 plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.c   |   28 --------
 plugins/a11y-settings/Makefile.am                  |   36 ----------
 .../a11y-settings.gnome-settings-plugin.in         |    9 ---
 plugins/a11y-settings/gsd-a11y-settings-plugin.c   |   28 --------
 plugins/clipboard/Makefile.am                      |   57 +++------------
 .../clipboard/clipboard.gnome-settings-plugin.in   |   10 ---
 plugins/clipboard/gsd-clipboard-plugin.c           |   28 --------
 plugins/color/Makefile.am                          |   70 +++++--------------
 plugins/color/color.gnome-settings-plugin.in       |    9 ---
 plugins/color/gsd-color-plugin.c                   |   29 --------
 plugins/datetime/Makefile.am                       |   46 ------------
 plugins/datetime/datetime.gnome-settings-plugin.in |   10 ---
 plugins/datetime/gsd-datetime-plugin.c             |   28 --------
 plugins/dummy/Makefile.am                          |   60 ++++------------
 plugins/dummy/dummy.gnome-settings-plugin.in       |   10 ---
 plugins/dummy/gsd-dummy-plugin.c                   |   28 --------
 plugins/housekeeping/Makefile.am                   |   37 +---------
 plugins/housekeeping/gsd-housekeeping-plugin.c     |   28 --------
 .../housekeeping.gnome-settings-plugin.in          |    9 ---
 plugins/keyboard/Makefile.am                       |   60 ++++------------
 plugins/keyboard/gsd-keyboard-plugin.c             |   28 --------
 plugins/keyboard/keyboard.gnome-settings-plugin.in |    9 ---
 plugins/media-keys/Makefile.am                     |   57 +--------------
 plugins/media-keys/gsd-media-keys-plugin.c         |   28 --------
 .../media-keys/media-keys.gnome-settings-plugin.in |   10 ---
 plugins/mouse/Makefile.am                          |   42 +----------
 plugins/mouse/gsd-mouse-plugin.c                   |   28 --------
 plugins/mouse/mouse.gnome-settings-plugin.in       |    9 ---
 plugins/orientation/Makefile.am                    |   42 +----------
 plugins/orientation/gsd-orientation-plugin.c       |   29 --------
 .../orientation.gnome-settings-plugin.in           |   10 ---
 plugins/power/Makefile.am                          |   74 +++++---------------
 plugins/power/gsd-power-plugin.c                   |   28 --------
 plugins/power/power.gnome-settings-plugin.in       |    9 ---
 plugins/print-notifications/Makefile.am            |   38 ----------
 .../gsd-print-notifications-plugin.c               |   28 --------
 .../print-notifications.gnome-settings-plugin.in   |   10 ---
 plugins/rfkill/Makefile.am                         |   43 +-----------
 plugins/rfkill/gsd-rfkill-plugin.c                 |   29 --------
 plugins/rfkill/rfkill.gnome-settings-plugin.in     |   10 ---
 plugins/screensaver-proxy/Makefile.am              |   34 +--------
 .../gsd-screensaver-proxy-plugin.c                 |   28 --------
 .../screensaver-proxy.gnome-settings-plugin.in     |    9 ---
 plugins/sharing/Makefile.am                        |   50 ++++----------
 plugins/sharing/gsd-sharing-plugin.c               |   28 --------
 plugins/sharing/sharing.gnome-settings-plugin.in   |    9 ---
 plugins/smartcard/Makefile.am                      |   14 +----
 plugins/smartcard/gsd-smartcard-plugin.c           |   29 --------
 .../smartcard/smartcard.gnome-settings-plugin.in   |    9 ---
 plugins/sound/Makefile.am                          |   37 ----------
 plugins/sound/gsd-sound-plugin.c                   |   28 --------
 plugins/sound/sound.gnome-settings-plugin.in       |    9 ---
 plugins/wacom/Makefile.am                          |   51 +-------------
 plugins/wacom/gsd-wacom-plugin.c                   |   29 --------
 plugins/wacom/wacom.gnome-settings-plugin.in       |    9 ---
 plugins/xrandr/Makefile.am                         |   46 +-----------
 plugins/xrandr/gsd-xrandr-plugin.c                 |   28 --------
 plugins/xrandr/xrandr.gnome-settings-plugin.in     |    9 ---
 plugins/xsettings/Makefile.am                      |   65 ++++--------------
 plugins/xsettings/gsd-xsettings-plugin.c           |   28 --------
 .../xsettings/xsettings.gnome-settings-plugin.in   |    9 ---
 po/POTFILES.in                                     |   20 -----
 65 files changed, 128 insertions(+), 1686 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2ab6219..965375e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,9 +36,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext
 
 AM_GLIB_GNU_GETTEXT
 
-GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
-
 dnl ---------------------------------------------------------------------------
 dnl - Dependencies
 dnl ---------------------------------------------------------------------------
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 8029da6..a23d698 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -26,44 +26,6 @@ gsd_a11y_keyboard_LDADD =                                    \
        $(LIBNOTIFY_LIBS)                                       \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = \
-       liba11y-keyboard.la             \
-       $(NULL)
-
-liba11y_keyboard_la_SOURCES =          \
-       gsd-a11y-keyboard-plugin.c      \
-       gsd-a11y-keyboard-manager.h     \
-       gsd-a11y-keyboard-manager.c     \
-       $(NULL)
-
-liba11y_keyboard_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DGTKBUILDERDIR=\""$(gtkbuilderdir)"\" \
-       $(AM_CPPFLAGS)
-
-liba11y_keyboard_la_CFLAGS = \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(LIBNOTIFY_CFLAGS)             \
-       $(AM_CFLAGS)
-
-liba11y_keyboard_la_LDFLAGS =          \
-       $(GSD_PLUGIN_LDFLAGS)           \
-       $(NULL)
-
-liba11y_keyboard_la_LIBADD  =          \
-       $(SETTINGS_PLUGIN_LIBS)         \
-       $(XF86MISC_LIBS)                \
-       $(LIBNOTIFY_LIBS)               \
-       $(NULL)
-
-plugin_in_files =              \
-       a11y-keyboard.gnome-settings-plugin.in  \
-       $(NULL)
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.A11yKeyboard.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -72,19 +34,14 @@ org.gnome.SettingsDaemon.A11yKeyboard.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =                   \
-       $(plugin_in_files)      \
        $(gtkbuilder_DATA)      \
        $(desktop_in_files)     \
        $(NULL)
 
 CLEANFILES =                   \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index 1f752ab..c60b922 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -21,36 +21,6 @@ gsd_a11y_settings_LDADD =                                    \
        $(top_builddir)/plugins/common/libcommon.la             \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = \
-       liba11y-settings.la
-
-liba11y_settings_la_SOURCES =          \
-       gsd-a11y-settings-manager.c     \
-       gsd-a11y-settings-manager.h     \
-       gsd-a11y-settings-plugin.c
-
-liba11y_settings_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       $(AM_CPPFLAGS)
-
-liba11y_settings_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-liba11y_settings_la_LDFLAGS =          \
-       $(GSD_PLUGIN_LDFLAGS)
-
-liba11y_settings_la_LIBADD  =          \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files =              \
-       a11y-settings.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.A11ySettings.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -59,16 +29,10 @@ org.gnome.SettingsDaemon.A11ySettings.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =                   \
-       $(plugin_in_files)      \
        $(desktop_in_files)
 
 CLEANFILES =                   \
-       $(plugin_DATA)          \
        $(desktop_DATA)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
-
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index 6b42593..c514415 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -2,40 +2,6 @@ NULL =
 
 plugin_name = clipboard
 
-plugin_LTLIBRARIES = \
-       libclipboard.la         \
-       $(NULL)
-
-libclipboard_la_SOURCES =      \
-       gsd-clipboard-plugin.c  \
-       gsd-clipboard-manager.h \
-       gsd-clipboard-manager.c \
-       xutils.h                \
-       xutils.c                \
-       list.h                  \
-       list.c                  \
-       $(NULL)
-
-libclipboard_la_CPPFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/plugins/common                  \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       $(AM_CPPFLAGS)
-
-libclipboard_la_CFLAGS = \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-libclipboard_la_LDFLAGS =      \
-       $(GSD_PLUGIN_LDFLAGS)   \
-       $(NULL)
-
-libclipboard_la_LIBADD  =      \
-       $(SETTINGS_PLUGIN_LIBS) \
-       $(NULL)
-
 libexec_PROGRAMS = gsd-clipboard
 gsd_clipboard_SOURCES =        \
        main.c                  \
@@ -47,15 +13,19 @@ gsd_clipboard_SOURCES =     \
        list.c                  \
        $(NULL)
 
-gsd_clipboard_CFLAGS = $(libclipboard_la_CFLAGS)
-gsd_clipboard_CPPFLAGS = $(libclipboard_la_CPPFLAGS)
-gsd_clipboard_LDADD = $(libclipboard_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la
+gsd_clipboard_CFLAGS =                 \
+       $(SETTINGS_PLUGIN_CFLAGS)       \
+       $(AM_CFLAGS)
 
-plugin_in_files =              \
-       clipboard.gnome-settings-plugin.in      \
-       $(NULL)
+gsd_clipboard_CPPFLAGS =                                       \
+       $(PLUGIN_CFLAGS)                                        \
+       -I$(top_srcdir)/gnome-settings-daemon                   \
+       -I$(top_builddir)/gnome-settings-daemon                 \
+       -I$(top_srcdir)/plugins/common                          \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
+       $(AM_CPPFLAGS)
 
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+gsd_clipboard_LDADD = $(SETTINGS_PLUGIN_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
 
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Clipboard.desktop.in
@@ -65,18 +35,13 @@ org.gnome.SettingsDaemon.Clipboard.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =                   \
-       $(plugin_in_files)      \
        $(desktop_in_files)     \
        $(NULL)
 
 CLEANFILES =                   \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index fdf1c97..9d6091f 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -1,45 +1,5 @@
 plugin_name = color
 
-plugin_LTLIBRARIES = \
-       libcolor.la
-
-libcolor_la_SOURCES =                  \
-       gcm-edid.c                      \
-       gcm-edid.h                      \
-       gsd-color-calibrate.c           \
-       gsd-color-calibrate.h           \
-       gsd-color-manager.c             \
-       gsd-color-manager.h             \
-       gsd-color-profiles.c            \
-       gsd-color-profiles.h            \
-       gsd-color-state.c               \
-       gsd-color-state.h               \
-       gsd-color-plugin.c
-
-libcolor_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/plugins/common                  \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DBINDIR=\"$(bindir)\"                          \
-       $(AM_CPPFLAGS)
-
-libcolor_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(COLOR_CFLAGS)         \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(LIBNOTIFY_CFLAGS)             \
-       $(AM_CFLAGS)
-
-libcolor_la_LDFLAGS =                  \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libcolor_la_LIBADD  =                  \
-       $(top_builddir)/gnome-settings-daemon/libgsd.la \
-       $(COLOR_LIBS)                   \
-       $(SETTINGS_PLUGIN_LIBS)         \
-       $(LIBNOTIFY_LIBS)
-
 check_PROGRAMS =                       \
        gcm-self-test
 
@@ -80,14 +40,27 @@ gsd_color_SOURCES =                 \
        gsd-color-state.h               \
        $(NULL)
 
-gsd_color_CFLAGS = $(libcolor_la_CFLAGS)
-gsd_color_CPPFLAGS = $(libcolor_la_CPPFLAGS)
-gsd_color_LDADD = $(libcolor_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la $(LIBM)
+gsd_color_CFLAGS =                     \
+       $(PLUGIN_CFLAGS)                \
+       $(COLOR_CFLAGS)                 \
+       $(SETTINGS_PLUGIN_CFLAGS)       \
+       $(LIBNOTIFY_CFLAGS)             \
+       $(AM_CFLAGS)
 
-plugin_in_files =                      \
-       color.gnome-settings-plugin.in
+gsd_color_CPPFLAGS =                                           \
+       -I$(top_srcdir)/gnome-settings-daemon                   \
+       -I$(top_builddir)/gnome-settings-daemon                 \
+       -I$(top_srcdir)/plugins/common                          \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
+       -DBINDIR=\"$(bindir)\"                                  \
+       $(AM_CPPFLAGS)
 
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+gsd_color_LDADD =                                              \
+       $(top_builddir)/gnome-settings-daemon/libgsd.la         \
+       $(COLOR_LIBS)                                           \
+       $(SETTINGS_PLUGIN_LIBS)                                 \
+       $(LIBNOTIFY_LIBS)                                       \
+       $(LIBM)
 
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Color.desktop.in
@@ -97,17 +70,12 @@ org.gnome.SettingsDaemon.Color.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =                                   \
-       $(plugin_in_files)                      \
        $(desktop_in_files)                     \
        test-data/Lenovo-T61-Internal.bin       \
        test-data/LG-L225W-External.bin
 
 CLEANFILES =                           \
-       $(plugin_DATA)                  \
        $(desktop_DATA)
 
 DISTCLEANFILES =                       \
-       $(plugin_DATA)                  \
        $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index b4b52d5..869a81f 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -46,47 +46,6 @@ gsd_datetime_LDADD =                                 \
        $(LIBM)                                                 \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = \
-       libdatetime.la
-
-libdatetime_la_SOURCES =       \
-       $(BUILT_SOURCES)        \
-       gsd-datetime-plugin.c   \
-       gsd-datetime-manager.h  \
-       gsd-datetime-manager.c  \
-       gsd-timezone-monitor.h  \
-       gsd-timezone-monitor.c  \
-       tz.h                    \
-       tz.c                    \
-       weather-tz.c            \
-       weather-tz.h
-
-libdatetime_la_CPPFLAGS =                                      \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon                 \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""                  \
-       $(AM_CPPFLAGS)
-
-libdatetime_la_CFLAGS =                        \
-       $(DATETIME_CFLAGS)              \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-libdatetime_la_LDFLAGS = \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libdatetime_la_LIBADD = \
-       $(DATETIME_LIBS)                                                \
-       $(LIBM) \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files = \
-       datetime.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Datetime.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -96,15 +55,10 @@ org.gnome.SettingsDaemon.Datetime.desktop: $(desktop_in_files) Makefile
 
 EXTRA_DIST =                           \
        timedated1-interface.xml        \
-       $(plugin_in_files)              \
        $(desktop_in_files)
 
 CLEANFILES = \
-       $(plugin_DATA) \
        $(desktop_DATA)
 
 DISTCLEANFILES = \
-       $(plugin_DATA) \
        $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 125dd4d..506ded5 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -1,59 +1,27 @@
 plugin_name = dummy
 
-plugin_LTLIBRARIES = \
-       libdummy.la
-
-libdummy_la_SOURCES =          \
-       gsd-dummy-manager.c     \
-       gsd-dummy-manager.h     \
-       gsd-dummy-plugin.c
-
-libdummy_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       $(AM_CPPFLAGS)
-
-libdummy_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-libdummy_la_LDFLAGS =          \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libdummy_la_LIBADD  =          \
-       $(SETTINGS_PLUGIN_LIBS)
-
 libexec_PROGRAMS = gsd-dummy
 gsd_dummy_SOURCES =                    \
        main.c                          \
        gsd-dummy-manager.c             \
        gsd-dummy-manager.h
 
-gsd_dummy_CFLAGS = $(libdummy_la_CFLAGS)
-gsd_dummy_CPPFLAGS =                   \
-       -I$(top_srcdir)/plugins/common  \
-       $(libdummy_la_CPPFLAGS)
-gsd_dummy_LDADD = $(libdummy_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la
-
-plugin_in_files =              \
-       dummy.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+gsd_dummy_CFLAGS =                     \
+       $(PLUGIN_CFLAGS)                \
+       $(SETTINGS_PLUGIN_CFLAGS)       \
+       $(AM_CFLAGS)
 
-EXTRA_DIST =                   \
-       $(plugin_in_files)
+gsd_dummy_CPPFLAGS =                   \
+       -I$(top_srcdir)/gnome-settings-daemon           \
+       -I$(top_builddir)/gnome-settings-daemon         \
+       -I$(top_srcdir)/plugins/common                  \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+       $(AM_CPPFLAGS)
 
-CLEANFILES =                   \
-       $(plugin_DATA)
+gsd_dummy_LDADD = $(SETTINGS_PLUGIN_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
 
-DISTCLEANFILES =               \
-       $(plugin_DATA)
+EXTRA_DIST = $(NULL)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+CLEANFILES = $(NULL)
 
-# override to _not_ install the test plugin
-# do not copy into your plugin
-install-pluginDATA:
-install-pluginLTLIBRARIES:
+DISTCLEANFILES = $(NULL)
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index d65c342..4e99f46 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -67,35 +67,6 @@ gsd_housekeeping_LDADD =                                     \
        $(SETTINGS_DAEMON_LIBS)                                 \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = libhousekeeping.la
-
-libhousekeeping_la_SOURCES =           \
-       $(COMMON_FILES)                 \
-       gsd-housekeeping-manager.c      \
-       gsd-housekeeping-manager.h      \
-       gsd-housekeeping-plugin.c
-
-libhousekeeping_la_CPPFLAGS =                                  \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon                 \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       $(AM_CPPFLAGS)
-
-libhousekeeping_la_CFLAGS =            \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(GIOUNIX_CFLAGS)               \
-       $(LIBNOTIFY_CFLAGS)             \
-       $(AM_CFLAGS)
-
-libhousekeeping_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
-
-libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
-
-plugin_in_files = housekeeping.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Housekeeping.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -103,10 +74,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Housekeeping.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(plugin_in_files) $(desktop_in_files)
-
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
+EXTRA_DIST = $(desktop_in_files)
 
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
+CLEANFILES = $(desktop_DATA)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 9742533..624d43f 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -2,56 +2,31 @@ NULL =
 
 plugin_name = keyboard
 
-plugin_LTLIBRARIES = \
-       libkeyboard.la          \
-       $(NULL)
-
-libkeyboard_la_SOURCES =       \
-       gsd-keyboard-plugin.c   \
+libexec_PROGRAMS = gsd-keyboard
+gsd_keyboard_SOURCES =         \
+       main.c                  \
        gsd-keyboard-manager.h  \
        gsd-keyboard-manager.c  \
        $(NULL)
 
-libkeyboard_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/data                            \
-       -I$(top_srcdir)/plugins/common                  \
-       -DDATADIR=\""$(pkgdatadir)"\"                   \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       $(AM_CPPFLAGS)
-
-libkeyboard_la_CFLAGS = \
+gsd_keyboard_CFLAGS =                  \
        $(PLUGIN_CFLAGS)                \
        $(SETTINGS_PLUGIN_CFLAGS)       \
        $(AM_CFLAGS)
 
-libkeyboard_la_LDFLAGS =       \
-       $(GSD_PLUGIN_LDFLAGS)   \
-       $(NULL)
+gsd_keyboard_CPPFLAGS =                                                \
+       -I$(top_srcdir)/gnome-settings-daemon                   \
+       -I$(top_builddir)/gnome-settings-daemon                 \
+       -I$(top_srcdir)/data                                    \
+       -I$(top_srcdir)/plugins/common                          \
+       -DDATADIR=\""$(pkgdatadir)"\"                           \
+       -DLIBEXECDIR=\""$(libexecdir)"\"                        \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
+       $(AM_CPPFLAGS)
 
-libkeyboard_la_LIBADD  =                               \
+gsd_keyboard_LDADD =                                   \
        $(top_builddir)/plugins/common/libcommon.la     \
-       $(SETTINGS_PLUGIN_LIBS)                         \
-       $(NULL)
-
-libexec_PROGRAMS = gsd-keyboard
-gsd_keyboard_SOURCES =         \
-       main.c                  \
-       gsd-keyboard-manager.h  \
-       gsd-keyboard-manager.c  \
-       $(NULL)
-
-gsd_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS)
-gsd_keyboard_CPPFLAGS = $(libkeyboard_la_CPPFLAGS)
-gsd_keyboard_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la
-
-plugin_in_files =              \
-       keyboard.gnome-settings-plugin.in       \
-       $(NULL)
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+       $(SETTINGS_PLUGIN_LIBS)
 
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Keyboard.desktop.in
@@ -61,18 +36,13 @@ org.gnome.SettingsDaemon.Keyboard.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =                   \
-       $(plugin_in_files)      \
        $(desktop_in_files)     \
        $(NULL)
 
 CLEANFILES =                   \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 0676eab..8e5e41b 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -6,7 +6,6 @@ plugin_name = media-keys
 NULL =
 
 SUBDIRS = gvc
-plugin_LTLIBRARIES = libmedia-keys.la
 
 BUILT_SOURCES =                        \
        gsd-marshal.h                   \
@@ -28,55 +27,6 @@ shell-key-grabber.h: Makefile.am org.gnome.ShellKeyGrabber.xml
                      --c-namespace Shell                       \
                      $(srcdir)/org.gnome.ShellKeyGrabber.xml
 
-libmedia_keys_la_SOURCES =             \
-       gsd-media-keys-plugin.c         \
-       gsd-media-keys-manager.h        \
-       gsd-media-keys-manager.c        \
-       gsd-screenshot-utils.h          \
-       gsd-screenshot-utils.c          \
-       shortcuts-list.h                \
-       media-keys.h                    \
-       shell-action-modes.h            \
-       bus-watch-namespace.c           \
-       bus-watch-namespace.h           \
-       mpris-controller.c              \
-       mpris-controller.h              \
-       $(BUILT_SOURCES)                \
-       $(NULL)
-
-libmedia_keys_la_CPPFLAGS = \
-       -I$(top_srcdir)/data/                                   \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon                 \
-       -I$(top_srcdir)/plugins/common                          \
-       -I$(top_srcdir)/plugins/media-keys/gvc                  \
-       -DBINDIR=\"$(bindir)\"                                  \
-       -DPIXMAPDIR=\""$(pkgdatadir)"\"                         \
-       -DGTKBUILDERDIR=\""$(pkgdatadir)"\"                     \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       $(AM_CPPFLAGS)
-
-libmedia_keys_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(MEDIA_KEYS_CFLAGS)            \
-       $(AM_CFLAGS)
-
-libmedia_keys_la_LDFLAGS =             \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libmedia_keys_la_LIBADD  =             \
-       $(top_builddir)/plugins/common/libcommon.la                     \
-       $(top_builddir)/plugins/media-keys/gvc/libgvc.la                \
-       $(MEDIA_KEYS_LIBS)                                              \
-       $(SETTINGS_PLUGIN_LIBS)                                         \
-       -lm
-
-plugin_in_files =              \
-       media-keys.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.MediaKeys.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -95,6 +45,9 @@ gsd_media_keys_SOURCES =                      \
        bus-watch-namespace.h                   \
        mpris-controller.c                      \
        mpris-controller.h                      \
+       media-keys.h                            \
+       shell-action-modes.h                    \
+       shortcuts-list.h                        \
        main.c                                  \
        $(BUILT_SOURCES)                        \
        $(NULL)
@@ -135,11 +88,7 @@ EXTRA_DIST =                                \
 
 CLEANFILES =                   \
        $(BUILT_SOURCES)        \
-       $(plugin_DATA)          \
        $(desktop_DATA)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 1409def..8058468 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -1,39 +1,5 @@
 plugin_name = mouse
 
-plugin_LTLIBRARIES = libmouse.la
-
-libmouse_la_SOURCES =          \
-       gsd-mouse-plugin.c      \
-       gsd-mouse-manager.h     \
-       gsd-mouse-manager.c
-
-libmouse_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/plugins/common/                 \
-       -I$(top_srcdir)/data/                           \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\" \
-       $(AM_CPPFLAGS)
-
-libmouse_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(MOUSE_CFLAGS)                 \
-       $(AM_CFLAGS)
-
-libmouse_la_LDFLAGS =          \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libmouse_la_LIBADD  =                                                  \
-       $(MOUSE_LIBS)                                                   \
-       $(top_builddir)/plugins/common/libcommon.la                     \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files = mouse.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Mouse.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -89,8 +55,6 @@ gsd_mouse_LDADD =                                             \
        $(MOUSE_LIBS)                   \
        -lm
 
-EXTRA_DIST = $(plugin_in_files) $(desktop_in_files)
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am
index 362e415..8ce1139 100644
--- a/plugins/orientation/Makefile.am
+++ b/plugins/orientation/Makefile.am
@@ -23,40 +23,6 @@ gsd_orientation_LDADD =                                              \
        $(ORIENTATION_LIBS)                                     \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = liborientation.la
-
-liborientation_la_SOURCES =            \
-       gsd-orientation-plugin.c        \
-       gsd-orientation-manager.h       \
-       gsd-orientation-manager.c
-
-liborientation_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/plugins/common/                 \
-       -I$(top_srcdir)/data/                           \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
-       $(AM_CPPFLAGS)
-
-liborientation_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(ORIENTATION_CFLAGS)           \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-liborientation_la_LDFLAGS =            \
-       $(GSD_PLUGIN_LDFLAGS)
-
-liborientation_la_LIBADD  =                                            \
-       $(top_builddir)/plugins/common/libcommon.la                     \
-       $(ORIENTATION_LIBS)                                             \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files = orientation.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Orientation.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -64,8 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Orientation.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(plugin_in_files) $(desktop_in_files)
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 0c28e28..586ba43 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -2,53 +2,6 @@ BUILT_SOURCES =
 
 plugin_name = power
 
-plugin_LTLIBRARIES =                                   \
-       libpower.la
-
-libpower_la_SOURCES =                                  \
-       gpm-common.c                                    \
-       gpm-common.h                                    \
-       gsd-backlight-linux.c                           \
-       gsd-backlight-linux.h                           \
-       gsd-power-manager.c                             \
-       gsd-power-manager.h                             \
-       gsm-inhibitor-flag.h                            \
-       gsm-presence-flag.h                             \
-       gsm-manager-logout-mode.h                       \
-       gsd-power-constants.h                           \
-       gsd-power-plugin.c
-
-libpower_la_CPPFLAGS = \
-       -I$(top_srcdir)/data/                           \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/plugins/common                  \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DGTKBUILDERDIR=\""$(pkgdatadir)"\"             \
-       -DSBINDIR=\"$(sbindir)\"                        \
-       -DLIBEXECDIR=\"$(libexecdir)\"                  \
-       $(AM_CPPFLAGS)
-
-libpower_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                                \
-       $(POWER_CFLAGS)                                 \
-       $(SETTINGS_PLUGIN_CFLAGS)                       \
-       $(AM_CFLAGS)
-
-libpower_la_LDFLAGS =                                  \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libpower_la_LIBADD  =                                  \
-       $(top_builddir)/plugins/common/libcommon.la     \
-       $(top_builddir)/gnome-settings-daemon/libgsd.la \
-       $(POWER_LIBS)                                   \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files =                                      \
-       power.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Power.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -84,8 +37,23 @@ gsd_power_SOURCES =                          \
        gsd-power-constants.h                           \
        main.c
 
-gsd_power_CFLAGS = $(libpower_la_CFLAGS)
-gsd_power_CPPFLAGS = $(libpower_la_CPPFLAGS)
+gsd_power_CFLAGS =                                     \
+       $(PLUGIN_CFLAGS)                                \
+       $(POWER_CFLAGS)                                 \
+       $(SETTINGS_PLUGIN_CFLAGS)                       \
+       $(AM_CFLAGS)
+
+gsd_power_CPPFLAGS =                                   \
+       -I$(top_srcdir)/data/                           \
+       -I$(top_srcdir)/gnome-settings-daemon           \
+       -I$(top_builddir)/gnome-settings-daemon         \
+       -I$(top_srcdir)/plugins/common                  \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+       -DGTKBUILDERDIR=\""$(pkgdatadir)"\"             \
+       -DSBINDIR=\"$(sbindir)\"                        \
+       -DLIBEXECDIR=\"$(libexecdir)\"                  \
+       $(AM_CPPFLAGS)
+
 gsd_power_LDADD =                                      \
        -lm                                             \
        $(top_builddir)/plugins/common/libcommon.la     \
@@ -94,7 +62,6 @@ gsd_power_LDADD =                                     \
        $(SETTINGS_PLUGIN_LIBS)
 
 EXTRA_DIST =                                           \
-       $(plugin_in_files)                              \
        $(desktop_in_files)                             \
        $(gsd_backlight_helper_SOURCES)                 \
        $(NULL)
@@ -145,8 +112,8 @@ gsd_power_enums_update_SOURCES =            \
        gsd-power-enums-update.c                \
        gsd-power-enums.h                       \
        gsd-power-enums.c
-gsd_power_enums_update_CFLAGS = $(libpower_la_CFLAGS)
-gsd_power_enums_update_CPPFLAGS = $(libpower_la_CPPFLAGS) -I$(top_builddir)/plugins/power
+gsd_power_enums_update_CFLAGS = $(gsd_power_CFLAGS)
+gsd_power_enums_update_CPPFLAGS = $(gsd_power_CPPFLAGS) -I$(top_builddir)/plugins/power
 gsd_power_enums_update_LDFLAGS = $(POWER_LIBS)
 
 EXTRA_DIST += gsd-power-constants-update.pl gsdpowerconstants.py gsdpowerenums.py test.py
@@ -160,11 +127,8 @@ clean-local:
        rm -f *~
 
 CLEANFILES =                                                   \
-       $(plugin_DATA)                                          \
        $(desktop_DATA)                                         \
        org.gnome.settings-daemon.plugins.power.policy          \
        org.gnome.settings-daemon.plugins.power.policy.in       \
        $(GSD_POWER_ENUM_FILES)                                 \
        gsdpowerenums.pyc gsdpowerenums.py
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index a9211fc..98b105d 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -1,38 +1,5 @@
 plugin_name = print-notifications
 
-plugin_LTLIBRARIES = \
-       libprint-notifications.la
-
-libprint_notifications_la_SOURCES =            \
-       gsd-print-notifications-manager.c       \
-       gsd-print-notifications-manager.h       \
-       gsd-print-notifications-plugin.c
-
-libprint_notifications_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\" \
-       $(AM_CPPFLAGS)                  \
-       $(CUPS_CPPFLAGS)
-
-libprint_notifications_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-libprint_notifications_la_LDFLAGS =            \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libprint_notifications_la_LIBADD  =            \
-       $(CUPS_LIBS)                    \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files =              \
-       print-notifications.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.PrintNotifications.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -85,15 +52,10 @@ gsd_print_notifications_LDADD =                             \
        $(LIBNOTIFY_LIBS)
 
 EXTRA_DIST =                   \
-       $(plugin_in_files)      \
        $(desktop_in_files)
 
 CLEANFILES =                   \
-       $(plugin_DATA)          \
        $(desktop_DATA)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index d3df744..8c28b1c 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -24,41 +24,6 @@ gsd_rfkill_LDADD =                                           \
        $(top_builddir)/plugins/common/libcommon.la             \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = librfkill.la
-
-librfkill_la_SOURCES =                 \
-       gsd-rfkill-plugin.c     \
-       gsd-rfkill-manager.h    \
-       gsd-rfkill-manager.c    \
-       rfkill-glib.c           \
-       rfkill-glib.h           \
-       rfkill.h
-
-librfkill_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/data/                           \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
-       $(AM_CPPFLAGS)
-
-librfkill_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(RFKILL_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-librfkill_la_LDFLAGS =                 \
-       $(GSD_PLUGIN_LDFLAGS)
-
-librfkill_la_LIBADD  =                                         \
-       $(RFKILL_LIBS)                                          \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files = rfkill.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Rfkill.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -69,8 +34,6 @@ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
 udevrulesdir = $(prefix)/lib/udev/rules.d
 udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
 
-EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA) $(desktop_in_files)
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
+EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am
index 2f2da3a..e35cd55 100644
--- a/plugins/screensaver-proxy/Makefile.am
+++ b/plugins/screensaver-proxy/Makefile.am
@@ -1,27 +1,5 @@
 plugin_name = screensaver-proxy
 
-plugin_LTLIBRARIES = libscreensaver-proxy.la
-
-libscreensaver_proxy_la_SOURCES =      \
-       gsd-screensaver-proxy-manager.c \
-       gsd-screensaver-proxy-manager.h \
-       gsd-screensaver-proxy-plugin.c
-
-libscreensaver_proxy_la_CPPFLAGS =                             \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       $(AM_CPPFLAGS)
-
-libscreensaver_proxy_la_CFLAGS =       \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
-
-libscreensaver_proxy_la_LIBADD  = $(SETTINGS_PLUGIN_LIBS)
-
 libexec_PROGRAMS = gsd-screensaver-proxy
 
 gsd_screensaver_proxy_SOURCES =                                \
@@ -49,10 +27,6 @@ gsd_screensaver_proxy_LDADD =                                        \
        $(SETTINGS_DAEMON_LIBS)                 \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_in_files = screensaver-proxy.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -60,10 +34,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.ScreensaverProxy.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(plugin_in_files) $(desktop_in_files)
-
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
+EXTRA_DIST = $(desktop_in_files)
 
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
+CLEANFILES = $(desktop_DATA)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/sharing/Makefile.am b/plugins/sharing/Makefile.am
index 39a5512..be94e28 100644
--- a/plugins/sharing/Makefile.am
+++ b/plugins/sharing/Makefile.am
@@ -1,30 +1,5 @@
 plugin_name = sharing
 
-plugin_LTLIBRARIES = libsharing.la
-
-libsharing_la_SOURCES =                \
-       gsd-sharing-manager.c   \
-       gsd-sharing-manager.h   \
-       gsd-sharing-enums.h     \
-       gsd-sharing-plugin.c
-
-libsharing_la_CPPFLAGS =                                       \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon                 \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       $(AM_CPPFLAGS)
-
-libsharing_la_CFLAGS =                 \
-       -I$(top_srcdir)/plugins/common  \
-       $(SHARING_CFLAGS)               \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-libsharing_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
-
-libsharing_la_LIBADD  = $(SETTINGS_PLUGIN_LIBS) $(SHARING_LIBS)
-
 libexec_PROGRAMS = gsd-sharing
 gsd_sharing_SOURCES =                                  \
        gsd-sharing-manager.c                           \
@@ -32,17 +7,22 @@ gsd_sharing_SOURCES =                                        \
        gsd-sharing-enums.h                             \
        main.c
 
-gsd_sharing_CFLAGS = $(libsharing_la_CFLAGS)
-gsd_sharing_CPPFLAGS = $(libsharing_la_CPPFLAGS)
+gsd_sharing_CFLAGS =                   \
+       -I$(top_srcdir)/plugins/common  \
+       $(SHARING_CFLAGS)               \
+       $(PLUGIN_CFLAGS)                \
+       $(SETTINGS_PLUGIN_CFLAGS)       \
+       $(AM_CFLAGS)
+gsd_sharing_CPPFLAGS =                                         \
+       -I$(top_srcdir)/gnome-settings-daemon                   \
+       -I$(top_builddir)/gnome-settings-daemon                 \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
+       $(AM_CPPFLAGS)
 gsd_sharing_LDADD =                                    \
        $(top_builddir)/gnome-settings-daemon/libgsd.la \
        $(SHARING_LIBS)                                 \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_in_files = sharing.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Sharing.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -50,8 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Sharing.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(plugin_in_files) $(desktop_in_files)
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 0f3847b..7724d27 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -7,9 +7,6 @@ BUILT_SOURCES = $(dbus_built_sources) $(enum_built_sources)
 
 libexec_PROGRAMS = gsd-smartcard
 
-plugin_LTLIBRARIES = \
-       libsmartcard.la
-
 $(dbus_built_sources) : Makefile.am org.gnome.SettingsDaemon.Smartcard.xml
        $(AM_V_GEN) gdbus-codegen \
        --interface-prefix org.gnome.SettingsDaemon.Smartcard. \
@@ -28,6 +25,7 @@ gsd_smartcard_SOURCES =        \
        gsd-smartcard-service.c \
        gsd-smartcard-service.h \
        gsd-smartcard-manager.c \
+       gsd-smartcard-manager.h \
        gsd-smartcard-utils.h \
        gsd-smartcard-utils.c   \
        main.c
@@ -98,13 +96,6 @@ libsmartcard_la_LIBADD = \
        $(SETTINGS_PLUGIN_LIBS)        \
        $(NSS_LIBS)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
-
-plugin_in_files = \
-       smartcard.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Smartcard.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -116,15 +107,12 @@ EXTRA_DIST = \
        gsd-smartcard-enum-types.c.in \
        gsd-smartcard-enum-types.h.in \
        org.gnome.SettingsDaemon.Smartcard.xml \
-       $(plugin_in_files) \
        $(desktop_in_files)
 
 CLEANFILES = \
        $(BUILT_SOURCES) \
-       $(plugin_DATA) \
        $(desktop_DATA)
 
 DISTCLEANFILES = \
        $(BUILT_SOURCES) \
-       $(plugin_DATA) \
        $(desktop_DATA)
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index 829ec07..dfe6baf 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -23,38 +23,6 @@ gsd_sound_LDADD =                                            \
        $(SOUND_LIBS)                                           \
        $(SETTINGS_PLUGIN_LIBS)
 
-plugin_LTLIBRARIES = \
-       libsound.la
-
-libsound_la_SOURCES = \
-       gsd-sound-plugin.c \
-       gsd-sound-manager.h \
-       gsd-sound-manager.c
-
-libsound_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       $(AM_CPPFLAGS)
-
-libsound_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS) \
-       $(SOUND_CFLAGS) \
-       $(AM_CFLAGS)
-
-libsound_la_LDFLAGS = \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libsound_la_LIBADD = \
-       $(SETTINGS_PLUGIN_LIBS) \
-       $(SOUND_LIBS)
-
-plugin_in_files = \
-       sound.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Sound.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -63,15 +31,10 @@ org.gnome.SettingsDaemon.Sound.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST = \
-       $(plugin_in_files) \
        $(desktop_in_files)
 
 CLEANFILES = \
-       $(plugin_DATA) \
        $(desktop_DATA)
 
 DISTCLEANFILES = \
-       $(plugin_DATA) \
        $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 431ffe2..04e24bf 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -1,47 +1,5 @@
 plugin_name = wacom
 
-plugin_LTLIBRARIES = libgsdwacom.la
-
-libgsdwacom_la_SOURCES =       \
-       gsd-wacom-plugin.c      \
-       gsd-wacom-manager.h     \
-       gsd-wacom-manager.c     \
-       gsd-wacom-key-shortcut-button.h \
-       gsd-wacom-key-shortcut-button.c \
-       gsd-wacom-button-editor.h       \
-       gsd-wacom-button-editor.c       \
-       gsd-wacom-osd-window.h  \
-       gsd-wacom-osd-window.c  \
-       gsd-wacom-oled.h        \
-       gsd-wacom-oled.c        \
-       gsd-wacom-oled-constants.h \
-       gsd-wacom-device.c      \
-       gsd-wacom-device.h      \
-       gsd-wacom-resources.c
-
-libgsdwacom_la_CPPFLAGS = \
-       -I$(top_srcdir)/gnome-settings-daemon           \
-       -I$(top_builddir)/gnome-settings-daemon         \
-       -I$(top_srcdir)/plugins/common/                 \
-       -I$(top_srcdir)/data/                           \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
-       $(AM_CPPFLAGS)
-
-libgsdwacom_la_CFLAGS = \
-       $(PLUGIN_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(WACOM_CFLAGS)                 \
-       $(AM_CFLAGS)
-
-libgsdwacom_la_LDFLAGS =               \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libgsdwacom_la_LIBADD  =                                               \
-       $(top_builddir)/plugins/common/libcommon.la                     \
-       $(SETTINGS_PLUGIN_LIBS)                                         \
-       $(WACOM_LIBS)
-
 org.gnome.settings-daemon.plugins.wacom.policy.in: org.gnome.settings-daemon.plugins.wacom.policy.in.in 
Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
@@ -198,10 +156,6 @@ gsd_test_wacom_osd_LDADD = \
        $(WACOM_LIBS)                                           \
        -lm
 
-plugin_in_files = wacom.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Wacom.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -209,12 +163,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Wacom.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST += $(plugin_in_files) $(desktop_in_files) README.config-storage
+EXTRA_DIST += $(desktop_in_files) README.config-storage
 CLEANFILES =                                           \
-       $(plugin_DATA)                                  \
        $(desktop_DATA)                                 \
        gsd-wacom-resources.c                           \
        org.gnome.settings-daemon.plugins.wacom.policy  \
        org.gnome.settings-daemon.plugins.wacom.policy.in
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 38c6212..8bda44f 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -58,44 +58,6 @@ gsd_xrandr_LDADD =                                           \
        $(SETTINGS_PLUGIN_LIBS)                 \
        $(XRANDR_LIBS)
 
-plugin_LTLIBRARIES = \
-       libxrandr.la
-
-libxrandr_la_SOURCES =                 \
-       gsd-xrandr-plugin.c     \
-       gsd-xrandr-manager.h    \
-       gsd-xrandr-manager.c
-
-libxrandr_la_CPPFLAGS =                                                \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon                 \
-       -I$(top_srcdir)/data/                                   \
-       -I$(top_srcdir)/plugins/common/                         \
-       -DBINDIR=\"$(bindir)\"                                  \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       $(AM_CPPFLAGS)
-
-libxrandr_la_CFLAGS =                  \
-       $(PLUGIN_CFLAGS)                \
-       $(XRANDR_CFLAGS)                \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(WACOM_CFLAGS)                 \
-       $(AM_CFLAGS)
-
-libxrandr_la_LDFLAGS =                         \
-       $(GSD_PLUGIN_LDFLAGS)
-
-libxrandr_la_LIBADD  =                                 \
-       $(top_builddir)/plugins/common/libcommon.la     \
-       $(XRANDR_LIBS)                                  \
-       $(WACOM_LIBS)                                   \
-       $(SETTINGS_PLUGIN_LIBS)
-
-plugin_in_files =                      \
-       xrandr.gnome-settings-plugin.in
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.XRANDR.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -103,8 +65,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.XRANDR.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(plugin_in_files) $(desktop_in_files) $(ICON_FILES)
-CLEANFILES = $(plugin_DATA) $(desktop_DATA)
-DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
+EXTRA_DIST = $(desktop_in_files) $(ICON_FILES)
+CLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 5778f53..d2ac425 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -72,6 +72,7 @@ gsd_xsettings_SOURCES =               \
        gsd-xsettings-gtk.c     \
        gsd-xsettings-gtk.h     \
        gsd-xsettings-manager.c \
+       gsd-xsettings-manager.h \
        gsd-xsettings-gtk.h     \
        xsettings-common.c      \
        xsettings-common.h      \
@@ -85,60 +86,25 @@ gsd_xsettings_SOURCES =             \
        wm-button-layout-translation.h  \
        main.c
 
-gsd_xsettings_CFLAGS = $(libxsettings_la_CFLAGS) $(PLUGIN_CFLAGS)
-gsd_xsettings_CPPFLAGS = $(libxsettings_la_CPPFLAGS) -I$(top_srcdir)/plugins/common
-gsd_xsettings_LDADD = $(libxsettings_la_LIBADD)
-
-plugin_LTLIBRARIES = \
-       libxsettings.la         \
-       $(NULL)
-
-libxsettings_la_SOURCES =      \
-       gsd-xsettings-plugin.c  \
-       gsd-xsettings-manager.h \
-       gsd-xsettings-manager.c \
-       gsd-xsettings-gtk.c     \
-       gsd-xsettings-gtk.h     \
-       xsettings-common.h      \
-       xsettings-common.c      \
-       xsettings-manager.h     \
-       xsettings-manager.c     \
-       gsd-remote-display-manager.c \
-       gsd-remote-display-manager.h \
-       fontconfig-monitor.h    \
-       fontconfig-monitor.c    \
-       wm-button-layout-translation.c  \
-       wm-button-layout-translation.h  \
-       $(NULL)
-
-libxsettings_la_CPPFLAGS =                                     \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_builddir)/gnome-settings-daemon                 \
-       -I$(top_srcdir)/data/                                   \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
-       $(AM_CPPFLAGS)
-
-libxsettings_la_CFLAGS = \
+gsd_xsettings_CFLAGS =                 \
        $(SETTINGS_PLUGIN_CFLAGS)       \
+       $(PLUGIN_CFLAGS)                \
        $(XSETTINGS_CFLAGS)             \
        $(AM_CFLAGS)
 
-libxsettings_la_LDFLAGS =      \
-       $(GSD_PLUGIN_LDFLAGS)   \
-       $(NULL)
+gsd_xsettings_CPPFLAGS =                                                                               \
+       -I$(top_srcdir)/gnome-settings-daemon                                                           \
+       -I$(top_builddir)/gnome-settings-daemon                                                         \
+       -I$(top_srcdir)/plugins/common/                                                                 \
+       -I$(top_srcdir)/data/                                                                           \
+       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"                                              \
+       -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\"    \
+       $(AM_CPPFLAGS)
 
-libxsettings_la_LIBADD  =                                      \
+gsd_xsettings_LDADD =                                          \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(SETTINGS_PLUGIN_LIBS)                                 \
-       $(XSETTINGS_LIBS)                                       \
-       $(NULL)
-
-plugin_in_files =              \
-       xsettings.gnome-settings-plugin.in      \
-       $(NULL)
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+       $(XSETTINGS_LIBS)
 
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.XSettings.desktop.in
@@ -149,18 +115,13 @@ org.gnome.SettingsDaemon.XSettings.desktop: $(desktop_in_files) Makefile
 
 EXTRA_DIST =                   \
        README.xsettings        \
-       $(plugin_in_files)      \
        $(desktop_in_files)     \
        $(NULL)
 
 CLEANFILES =                   \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
 
 DISTCLEANFILES =               \
-       $(plugin_DATA)          \
        $(desktop_DATA)         \
        $(NULL)
-
-@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 32fbfa3..cac24fe 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,50 +12,30 @@ data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
 gnome-settings-daemon/main.c
-[type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.in
 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-[type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in
-[type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in
-[type: gettext/ini]plugins/color/color.gnome-settings-plugin.in
 plugins/color/gsd-color-calibrate.c
 plugins/color/gsd-color-manager.c
-[type: gettext/ini]plugins/datetime/datetime.gnome-settings-plugin.in
 plugins/datetime/gsd-datetime-manager.c
-[type: gettext/ini]plugins/dummy/dummy.gnome-settings-plugin.in
 plugins/housekeeping/gsd-disk-space.c
-[type: gettext/ini]plugins/housekeeping/housekeeping.gnome-settings-plugin.in
 plugins/keyboard/gsd-keyboard-manager.c
-[type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
 plugins/media-keys/gsd-media-keys-manager.c
 plugins/media-keys/gsd-screenshot-utils.c
 # Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get 
it.
 plugins/media-keys/gvc/gvc-mixer-control.c
-[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in
 plugins/media-keys/shortcuts-list.h
 plugins/mouse/gsd-mouse-manager.c
-[type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in
-[type: gettext/ini]plugins/orientation/orientation.gnome-settings-plugin.in
 plugins/power/gpm-common.c
 plugins/power/gsd-power-manager.c
 plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
-[type: gettext/ini]plugins/power/power.gnome-settings-plugin.in
 plugins/print-notifications/gsd-printer.c
 plugins/print-notifications/gsd-print-notifications-manager.c
-[type: gettext/ini]plugins/print-notifications/print-notifications.gnome-settings-plugin.in
-[type: gettext/ini]plugins/rfkill/rfkill.gnome-settings-plugin.in
-[type: gettext/ini]plugins/screensaver-proxy/screensaver-proxy.gnome-settings-plugin.in
 plugins/smartcard/gsd-smartcard-manager.c
 plugins/smartcard/gsd-smartcard-service.c
-[type: gettext/ini]plugins/smartcard/smartcard.gnome-settings-plugin.in
-[type: gettext/ini]plugins/sound/sound.gnome-settings-plugin.in
 plugins/wacom/gsd-wacom-button-editor.c
 plugins/wacom/gsd-wacom-device.c
 plugins/wacom/gsd-wacom-key-shortcut-button.c
 plugins/wacom/gsd-wacom-manager.c
 plugins/wacom/gsd-wacom-osd-window.c
 plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
-[type: gettext/ini]plugins/wacom/wacom.gnome-settings-plugin.in
 plugins/xrandr/gsd-xrandr-manager.c
-[type: gettext/ini]plugins/xrandr/xrandr.gnome-settings-plugin.in
 plugins/xsettings/gsd-xsettings-manager.c
-[type: gettext/ini]plugins/xsettings/xsettings.gnome-settings-plugin.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]