core: build keyfile plugin into NetworkManager

Since settings storage is now handled by NetworkManager, we must
have the ability to read/write all connection types at all times.
Since the 'keyfile' plugin is the only plugin that can handle all
connection types, build it into NetworkManager.

system-settings/plugins/keyfile/Makefile.am

@@ -3,12 +3,13 @@ SUBDIRS=. tests
 INCLUDES = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib
+	-I$(top_srcdir)/libnm-util
 
-pkglib_LTLIBRARIES = libnm-settings-plugin-keyfile.la
+noinst_LTLIBRARIES = \
+	libkeyfile-io.la \
+	libnm-settings-plugin-keyfile.la
 
-noinst_LTLIBRARIES = libkeyfile-io.la
+##### I/O library for testcases #####
 
 libkeyfile_io_la_SOURCES = \
 	reader.c \
@@ -28,6 +29,8 @@ libkeyfile_io_la_CPPFLAGS = \
 
 libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
 
+#####################################
+
 libnm_settings_plugin_keyfile_la_SOURCES = \
 	nm-keyfile-connection.c \
 	nm-keyfile-connection.h \
@@ -41,16 +44,16 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DG_DISABLE_DEPRECATED
 
-libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_keyfile_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
 	libkeyfile-io.la \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
 	$(DBUS_LIBS) \
 	$(GIO_LIBS)
 
+libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
+
 keyfiledir=$(sysconfdir)/NetworkManager/system-connections
 
 install-data-hook:

system-settings/plugins/keyfile/plugin.c

@@ -662,8 +662,8 @@ system_config_interface_init (NMSystemConfigInterface *system_config_interface_c
 	system_config_interface_class->get_unmanaged_specs = get_unmanaged_specs;
 }
 
-G_MODULE_EXPORT GObject *
-nm_system_config_factory (void)
+GObject *
+nm_settings_keyfile_plugin_new (void)
 {
 	static SCPluginKeyfile *singleton = NULL;
 

system-settings/plugins/keyfile/plugin.h

@@ -43,4 +43,6 @@ GType sc_plugin_keyfile_get_type (void);
 
 GQuark keyfile_plugin_error_quark (void);
 
+GObject *nm_settings_keyfile_plugin_new (void);
+
 #endif	/* _PLUGIN_H_ */