settings: move system-settings/plugins => src/settings/plugins

.gitignore

@@ -86,8 +86,7 @@ libnm-glib/libnm-glib-test
 src/NetworkManager
 src/nm-crash-logger
 src/supplicant-manager/tests/test-supplicant-config
-system-settings/src/nm-system-settings
+system-settings/src
-system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
 test/libnm-glib-test
 test/libnm_glib_test
 test/nm-online
@@ -105,13 +104,13 @@ src/tests/test-policy-hosts
 src/tests/test-wifi-ap-utils
 src/dhcp-manager/tests/test-dhcp-dhclient
 
-system-settings/plugins/keyfile/tests/test-keyfile
+src/settings/plugins/keyfile/tests/test-keyfile
-system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
+src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
-system-settings/plugins/ifcfg-rh/tests/network-scripts/Test_Write_*
+src/settings/plugins/ifcfg-rh/tests/network-scripts/Test_Write_*
-system-settings/plugins/ifcfg-rh/tests/network-scripts/*-Test_Write_*
+src/settings/plugins/ifcfg-rh/tests/network-scripts/*-Test_Write_*
-system-settings/plugins/ifupdown/tests/test-ifupdown
+src/settings/plugins/ifupdown/tests/test-ifupdown
-system-settings/plugins/ifnet/tests/check_ifnet
+src/settings/plugins/ifnet/tests/check_ifnet
 
 m4/gtk-doc.m4
 m4/intltool.m4

Makefile.am

@@ -4,7 +4,6 @@ SUBDIRS = \
 	libnm-util \
 	libnm-glib \
 	introspection \
-	system-settings \
 	src \
 	callouts \
 	cli \

configure.ac

@@ -553,6 +553,18 @@ src/dnsmasq-manager/Makefile
 src/modem-manager/Makefile
 src/bluez-manager/Makefile
 src/settings/Makefile
+src/settings/plugins/Makefile
+src/settings/plugins/ifupdown/Makefile
+src/settings/plugins/ifupdown/tests/Makefile
+src/settings/plugins/ifnet/Makefile
+src/settings/plugins/ifnet/tests/Makefile
+src/settings/plugins/ifcfg-rh/Makefile
+src/settings/plugins/ifcfg-rh/tests/Makefile
+src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
+src/settings/plugins/ifcfg-suse/Makefile
+src/settings/plugins/keyfile/Makefile
+src/settings/plugins/keyfile/tests/Makefile
+src/settings/plugins/keyfile/tests/keyfiles/Makefile
 src/wimax/Makefile
 src/backends/Makefile
 libnm-util/libnm-util.pc
@@ -565,19 +577,6 @@ libnm-glib/Makefile
 libnm-glib/tests/Makefile
 callouts/Makefile
 tools/Makefile
-system-settings/Makefile
-system-settings/plugins/Makefile
-system-settings/plugins/ifupdown/Makefile
-system-settings/plugins/ifupdown/tests/Makefile
-system-settings/plugins/ifnet/Makefile
-system-settings/plugins/ifnet/tests/Makefile
-system-settings/plugins/ifcfg-rh/Makefile
-system-settings/plugins/ifcfg-rh/tests/Makefile
-system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
-system-settings/plugins/ifcfg-suse/Makefile
-system-settings/plugins/keyfile/Makefile
-system-settings/plugins/keyfile/tests/Makefile
-system-settings/plugins/keyfile/tests/keyfiles/Makefile
 cli/Makefile
 cli/src/Makefile
 test/Makefile

po/POTFILES.in

@@ -25,7 +25,7 @@ src/nm-device-ethernet.c
 src/nm-device-olpc-mesh.c
 src/nm-manager.c
 src/nm-netlink-monitor.c
+src/settings/plugins/ifcfg-rh/reader.c
+src/settings/plugins/ifnet/connection_parser.c
 src/settings/nm-default-wired-connection.c
-system-settings/plugins/ifcfg-rh/reader.c
-system-settings/plugins/ifnet/connection_parser.c
 

src/settings/Makefile.am

@@ -1,3 +1,5 @@
+SUBDIRS=plugins
+
 INCLUDES = -I${top_srcdir} \
            -I${top_srcdir}/include \
            -I${top_srcdir}/libnm-util \
@@ -50,7 +52,7 @@ libsettings_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/marshallers/libmarshallers.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
-	$(top_builddir)/system-settings/plugins/keyfile/libnm-settings-plugin-keyfile.la \
+	$(builddir)/plugins/keyfile/libnm-settings-plugin-keyfile.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \

src/settings/nm-settings.c

@@ -62,7 +62,7 @@
 #include "nm-dbus-manager.h"
 #include "nm-manager-auth.h"
 #include "nm-session-monitor.h"
-#include "system-settings/plugins/keyfile/plugin.h"
+#include "plugins/keyfile/plugin.h"
 #include "nm-agent-manager.h"
 
 #define CONFIG_KEY_NO_AUTO_DEFAULT "no-auto-default"

src/settings/plugins/ifcfg-rh/tests/Makefile.am

@@ -4,7 +4,7 @@ INCLUDES = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(top_srcdir)/system-settings/plugins/ifcfg-rh
+	-I$(srcdir)/../
 
 noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils
 
@@ -20,7 +20,7 @@ test_ifcfg_rh_CPPFLAGS = \
 test_ifcfg_rh_LDADD = \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la \
+	$(builddir)/../libifcfg-rh-io.la \
 	$(DBUS_LIBS)
 
 test_ifcfg_rh_utils_SOURCES = \
@@ -30,7 +30,7 @@ test_ifcfg_rh_utils_CPPFLAGS = \
 	$(GLIB_CFLAGS)
 
 test_ifcfg_rh_utils_LDADD = \
-	$(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la
+	$(builddir)/../libifcfg-rh-io.la
 
 if WITH_TESTS