core: merge src/config, src/logging, src/posix-signals into src/

Some subdirectories of src/ encapsulate large chunks of functionality,
but src/config/, src/logging/, and src/posix-signals/ are really only
separated out because they used to be built into separate
sub-libraries that were needed either for test programs, or to prevent
circular dependencies. Since this is no longer relevant, simplify
things by moving their files back into the main source directory.

diff --git a/.gitignore b/.gitignore
index 8706c98..109c30b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -183,12 +183,12 @@ valgrind-*.log
 /src/tests/test-ip6-config
 /src/tests/test-wifi-ap-utils
 /src/tests/test-resolvconf-capture
+/src/tests/config/test-config
 /src/devices/wifi/tests/test-wifi-ap-utils
 /src/dnsmasq-manager/tests/test-dnsmasq-utils
 /src/dhcp-manager/tests/test-dhcp-dhclient
 /src/dhcp-manager/tests/test-dhcp-options
 /src/dhcp-manager/tests/test-dnsmasq-utils
-/src/config/tests/test-config
 
 /src/settings/plugins/keyfile/tests/test-keyfile
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh

diff --git a/configure.ac b/configure.ac
index 6d1aeb9..9694d88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -796,7 +796,7 @@ Makefile
 include/Makefile
 src/Makefile
 src/tests/Makefile
-src/config/tests/Makefile
+src/tests/config/Makefile
 src/dhcp-manager/Makefile
 src/dhcp-manager/tests/Makefile
 src/dnsmasq-manager/tests/Makefile

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3e34f5..9de406b 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -76,8 +76,6 @@ src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-dhclient-utils.c
 src/dhcp-manager/nm-dhcp-manager.c
 src/dns-manager/nm-dns-manager.c
-src/logging/nm-logging.c
-src/config/nm-config.c
 src/devices/adsl/nm-device-adsl.c
 src/devices/bluetooth/nm-bluez-device.c
 src/devices/bluetooth/nm-device-bt.c
@@ -89,6 +87,8 @@ src/devices/nm-device-vlan.c
 src/devices/team/nm-device-team.c
 src/devices/wifi/nm-device-olpc-mesh.c
 src/devices/wwan/nm-modem-broadband.c
+src/nm-config.c
+src/nm-logging.c
 src/nm-manager.c
 src/nm-sleep-monitor-systemd.c
 src/settings/plugins/ifcfg-rh/reader.c

diff --git a/src/Makefile.am b/src/Makefile.am
index d4ffab0..681a48f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ endif
 
 if ENABLE_TESTS
 SUBDIRS += \
-       config/tests \
        dhcp-manager/tests \
        dnsmasq-manager/tests \
        platform \
@@ -62,9 +61,6 @@ NetworkManager_LDADD = libNetworkManager.la
 noinst_LTLIBRARIES = libNetworkManager.la
 
 nm_sources = \
-       config/nm-config.c \
-       config/nm-config.h \
-       \
        devices/nm-device.c \
        devices/nm-device.h \
        devices/nm-device-bond.c \
@@ -125,9 +121,6 @@ nm_sources = \
        firewall-manager/nm-firewall-manager.c \
        firewall-manager/nm-firewall-manager.h \
        \
-       logging/nm-logging.c \
-       logging/nm-logging.h \
-       \
        platform/nm-fake-platform.c \
        platform/nm-fake-platform.h \
        platform/nm-linux-platform.c \
@@ -147,9 +140,6 @@ nm_sources = \
        rdisc/nm-rdisc.c \
        rdisc/nm-rdisc.h \
        \
-       posix-signals/nm-posix-signals.c \
-       posix-signals/nm-posix-signals.h \
-       \
        ppp-manager/nm-ppp-manager.c \
        ppp-manager/nm-ppp-manager.h \
        ppp-manager/nm-ppp-status.h \
@@ -207,6 +197,8 @@ nm_sources = \
        nm-activation-request.h \
        nm-active-connection.c \
        nm-active-connection.h \
+       nm-config.c \
+       nm-config.h \
        nm-connection-provider.c \
        nm-connection-provider.h \
        nm-connectivity.c \
@@ -227,6 +219,8 @@ nm_sources = \
        nm-ip4-config.h \
        nm-ip6-config.c \
        nm-ip6-config.h \
+       nm-logging.c \
+       nm-logging.h \
        nm-manager-auth.c \
        nm-manager-auth.h \
        nm-auth-subject.c \
@@ -235,6 +229,8 @@ nm_sources = \
        nm-manager.h \
        nm-policy.c \
        nm-policy.h \
+       nm-posix-signals.c \
+       nm-posix-signals.h \
        nm-properties-changed-signal.c \
        nm-properties-changed-signal.h \
        nm-rfkill-manager.c \

diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index 1770a7f..56601a3 100644 (file)
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
 AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/include \

diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index 41dda9a..cfa484e 100644 (file)
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
 AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \

diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
index 1358cca..9ad529a 100644 (file)
--- a/src/devices/team/Makefile.am
+++ b/src/devices/team/Makefile.am
@@ -5,10 +5,8 @@ include $(GLIB_MAKEFILE)
 AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/platform \
-       -I${top_srcdir}/src/posix-signals \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 59f279d..8c2a277 100644 (file)
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS=. tests
 AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \

diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
index 4b9b9dc..284908b 100644 (file)
--- a/src/devices/wifi/tests/Makefile.am
+++ b/src/devices/wifi/tests/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
-       -I$(top_srcdir)/src/logging \
        -I${top_srcdir}/src/platform \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/devices/wifi \

diff --git a/src/devices/wimax/Makefile.am b/src/devices/wimax/Makefile.am
index 2e45248..bb9e15c 100644 (file)
--- a/src/devices/wimax/Makefile.am
+++ b/src/devices/wimax/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/include \

diff --git a/src/devices/wimax/iwmxsdk.c b/src/devices/wimax/iwmxsdk.c
index d1ef7b6..4cd411d 100644 (file)
--- a/src/devices/wimax/iwmxsdk.c
+++ b/src/devices/wimax/iwmxsdk.c
@@ -36,7 +36,7 @@
 #include <WiMaxAPI.h>
 #include <WiMaxAPIEx.h>
 
-#include "logging/nm-logging.h"
+#include "nm-logging.h"
 #include "iwmxsdk.h"
 
 static WIMAX_API_DEVICE_ID g_api;

diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index d483177..66fed9f 100644 (file)
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
 AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \

diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index e9f9a61..fed2dff 100644 (file)
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \
        -I$(top_srcdir)/src/dhcp-manager \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/platform \
        -DG_LOG_DOMAIN=\""NetworkManager"\" \

diff --git a/src/config/nm-config.c b/src/nm-config.c
similarity index 100%
rename from src/config/nm-config.c
rename to src/nm-config.c

diff --git a/src/config/nm-config.h b/src/nm-config.h
similarity index 100%
rename from src/config/nm-config.h
rename to src/nm-config.h

diff --git a/src/logging/nm-logging.c b/src/nm-logging.c
similarity index 100%
rename from src/logging/nm-logging.c
rename to src/nm-logging.c

diff --git a/src/logging/nm-logging.h b/src/nm-logging.h
similarity index 100%
rename from src/logging/nm-logging.h
rename to src/nm-logging.h

diff --git a/src/posix-signals/nm-posix-signals.c b/src/nm-posix-signals.c
similarity index 100%
rename from src/posix-signals/nm-posix-signals.c
rename to src/nm-posix-signals.c

diff --git a/src/posix-signals/nm-posix-signals.h b/src/nm-posix-signals.h
similarity index 100%
rename from src/posix-signals/nm-posix-signals.h
rename to src/nm-posix-signals.h

diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 26d2476..c5bf87a 100644 (file)
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/include \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \
        -I${srcdir}/.. \

diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index a16f45d..b4f2842 100644 (file)
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir} \
        -I$(top_srcdir)/include \
        -I${top_srcdir}/src \
-       -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \

diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am
index f862e4d..b9d068a 100644 (file)
--- a/src/settings/plugins/example/Makefile.am
+++ b/src/settings/plugins/example/Makefile.am
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/config \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \

diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index c989617..229fe73 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -26,11 +26,8 @@ libifcfg_rh_io_la_SOURCES = \
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/ \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/src/posix-signals \
-       -I$(top_srcdir)/src/config \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \

diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 368588c..3679e83 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -11,10 +11,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/ \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/src/posix-signals \
        -I$(srcdir)/../ \
        -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index 3111dbf..8fcabf7 100644 (file)
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -4,8 +4,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/config \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \

diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index 1a4aca7..b8d6f37 100644 (file)
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS= \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/config \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/src/platform \
        -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \

diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index 0154d38..c1c0e56 100644 (file)
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -4,8 +4,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/logging \
-       -I$(top_srcdir)/src/config \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \

diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 994079b..24f1713 100644 (file)
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(srcdir)/../ \
        -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \

diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index 2066026..2e6b510 100644 (file)
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -4,8 +4,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/config \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \

diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 114d17a..d46bbde 100644 (file)
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(srcdir)/../ \
        $(GLIB_CFLAGS) \

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index ab7ae72..eee44dc 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,8 +1,9 @@
+SUBDIRS = config
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
-       -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/dhcp-manager \
        -I$(top_srcdir)/src \

diff --git a/src/config/tests/Makefile.am b/src/tests/config/Makefile.am
similarity index 95%
rename from src/config/tests/Makefile.am
rename to src/tests/config/Makefile.am
index 31ce724..64dd7fc 100644 (file)
--- a/src/config/tests/Makefile.am
+++ b/src/tests/config/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/ \
-       -I$(top_srcdir)/src/config \
        -I$(top_srcdir)/src/devices \
        -I${top_srcdir}/src/platform \
        -DG_LOG_DOMAIN=\""NetworkManager"\" \

diff --git a/src/config/tests/NetworkManager.conf b/src/tests/config/NetworkManager.conf
similarity index 100%
rename from src/config/tests/NetworkManager.conf
rename to src/tests/config/NetworkManager.conf

diff --git a/src/config/tests/bad.conf b/src/tests/config/bad.conf
similarity index 100%
rename from src/config/tests/bad.conf
rename to src/tests/config/bad.conf

diff --git a/src/config/tests/conf.d/00-overrides.conf b/src/tests/config/conf.d/00-overrides.conf
similarity index 100%
rename from src/config/tests/conf.d/00-overrides.conf
rename to src/tests/config/conf.d/00-overrides.conf

diff --git a/src/config/tests/conf.d/10-more.conf b/src/tests/config/conf.d/10-more.conf
similarity index 100%
rename from src/config/tests/conf.d/10-more.conf
rename to src/tests/config/conf.d/10-more.conf

diff --git a/src/config/tests/conf.d/90-last.conf b/src/tests/config/conf.d/90-last.conf
similarity index 100%
rename from src/config/tests/conf.d/90-last.conf
rename to src/tests/config/conf.d/90-last.conf

diff --git a/src/config/tests/nm-test-device.c b/src/tests/config/nm-test-device.c
similarity index 100%
rename from src/config/tests/nm-test-device.c
rename to src/tests/config/nm-test-device.c

diff --git a/src/config/tests/nm-test-device.h b/src/tests/config/nm-test-device.h
similarity index 100%
rename from src/config/tests/nm-test-device.h
rename to src/tests/config/nm-test-device.h

diff --git a/src/config/tests/test-config.c b/src/tests/config/test-config.c
similarity index 100%
rename from src/config/tests/test-config.c
rename to src/tests/config/test-config.c