plugins: Stop building helpers as plugins

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

3 files changed, 15 insertions, 82 deletions

diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 97425331..624d43fa 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/keyboard/gsd-keyboard-plugin.c b/plugins/keyboard/gsd-keyboard-plugin.c
deleted file mode 100644
index 975e2dec..00000000
--- a/plugins/keyboard/gsd-keyboard-plugin.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gmodule.h>
-
-#include "gnome-settings-plugin.h"
-#include "gsd-keyboard-manager.h"
-
-GNOME_SETTINGS_PLUGIN_REGISTER (GsdKeyboard, gsd_keyboard)
diff --git a/plugins/keyboard/keyboard.gnome-settings-plugin.in b/plugins/keyboard/keyboard.gnome-settings-plugin.in
deleted file mode 100644
index 0c83a0b2..00000000
--- a/plugins/keyboard/keyboard.gnome-settings-plugin.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[GNOME Settings Plugin]
-Module=keyboard
-IAge=0
-Priority=6
-_Name=Keyboard
-_Description=Keyboard plugin
-Authors=
-Copyright=Copyright © 2007
-Website=