colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Dan Winship
2014-07-25 12:04:04 -04:00
parent 5432ef5e52
commit 8aa3b9859b
40 changed files with 13 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -183,12 +183,12 @@ valgrind-*.log
/src/tests/test-ip6-config /src/tests/test-ip6-config
/src/tests/test-wifi-ap-utils /src/tests/test-wifi-ap-utils
/src/tests/test-resolvconf-capture /src/tests/test-resolvconf-capture
/src/tests/config/test-config
/src/devices/wifi/tests/test-wifi-ap-utils /src/devices/wifi/tests/test-wifi-ap-utils
/src/dnsmasq-manager/tests/test-dnsmasq-utils /src/dnsmasq-manager/tests/test-dnsmasq-utils
/src/dhcp-manager/tests/test-dhcp-dhclient /src/dhcp-manager/tests/test-dhcp-dhclient
/src/dhcp-manager/tests/test-dhcp-options /src/dhcp-manager/tests/test-dhcp-options
/src/dhcp-manager/tests/test-dnsmasq-utils /src/dhcp-manager/tests/test-dnsmasq-utils
/src/config/tests/test-config
/src/settings/plugins/keyfile/tests/test-keyfile /src/settings/plugins/keyfile/tests/test-keyfile
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh

2
configure.ac
View File

@@ -796,7 +796,7 @@ Makefile
include/Makefile include/Makefile
src/Makefile src/Makefile
src/tests/Makefile src/tests/Makefile
src/config/tests/Makefile src/tests/config/Makefile
src/dhcp-manager/Makefile src/dhcp-manager/Makefile
src/dhcp-manager/tests/Makefile src/dhcp-manager/tests/Makefile
src/dnsmasq-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile

4
po/POTFILES.in
View File

@@ -76,8 +76,6 @@ src/dhcp-manager/nm-dhcp-dhclient.c
src/dhcp-manager/nm-dhcp-dhclient-utils.c src/dhcp-manager/nm-dhcp-dhclient-utils.c
src/dhcp-manager/nm-dhcp-manager.c src/dhcp-manager/nm-dhcp-manager.c
src/dns-manager/nm-dns-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/adsl/nm-device-adsl.c
src/devices/bluetooth/nm-bluez-device.c src/devices/bluetooth/nm-bluez-device.c
src/devices/bluetooth/nm-device-bt.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/team/nm-device-team.c
src/devices/wifi/nm-device-olpc-mesh.c src/devices/wifi/nm-device-olpc-mesh.c
src/devices/wwan/nm-modem-broadband.c src/devices/wwan/nm-modem-broadband.c
src/nm-config.c
src/nm-logging.c
src/nm-manager.c src/nm-manager.c
src/nm-sleep-monitor-systemd.c src/nm-sleep-monitor-systemd.c
src/settings/plugins/ifcfg-rh/reader.c src/settings/plugins/ifcfg-rh/reader.c

16
src/Makefile.am
View File

@@ -26,7 +26,6 @@ endif
if ENABLE_TESTS if ENABLE_TESTS
SUBDIRS += \ SUBDIRS += \
config/tests \
dhcp-manager/tests \ dhcp-manager/tests \
dnsmasq-manager/tests \ dnsmasq-manager/tests \
platform \ platform \
@@ -62,9 +61,6 @@ NetworkManager_LDADD = libNetworkManager.la
noinst_LTLIBRARIES = libNetworkManager.la noinst_LTLIBRARIES = libNetworkManager.la
nm_sources = \ nm_sources = \
config/nm-config.c \
config/nm-config.h \
\
devices/nm-device.c \ devices/nm-device.c \
devices/nm-device.h \ devices/nm-device.h \
devices/nm-device-bond.c \ devices/nm-device-bond.c \
@@ -125,9 +121,6 @@ nm_sources = \
firewall-manager/nm-firewall-manager.c \ firewall-manager/nm-firewall-manager.c \
firewall-manager/nm-firewall-manager.h \ firewall-manager/nm-firewall-manager.h \
\ \
logging/nm-logging.c \
logging/nm-logging.h \
\
platform/nm-fake-platform.c \ platform/nm-fake-platform.c \
platform/nm-fake-platform.h \ platform/nm-fake-platform.h \
platform/nm-linux-platform.c \ platform/nm-linux-platform.c \
@@ -147,9 +140,6 @@ nm_sources = \
rdisc/nm-rdisc.c \ rdisc/nm-rdisc.c \
rdisc/nm-rdisc.h \ 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.c \
ppp-manager/nm-ppp-manager.h \ ppp-manager/nm-ppp-manager.h \
ppp-manager/nm-ppp-status.h \ ppp-manager/nm-ppp-status.h \
@@ -207,6 +197,8 @@ nm_sources = \
nm-activation-request.h \ nm-activation-request.h \
nm-active-connection.c \ nm-active-connection.c \
nm-active-connection.h \ nm-active-connection.h \
nm-config.c \
nm-config.h \
nm-connection-provider.c \ nm-connection-provider.c \
nm-connection-provider.h \ nm-connection-provider.h \
nm-connectivity.c \ nm-connectivity.c \
@@ -227,6 +219,8 @@ nm_sources = \
nm-ip4-config.h \ nm-ip4-config.h \
nm-ip6-config.c \ nm-ip6-config.c \
nm-ip6-config.h \ nm-ip6-config.h \
nm-logging.c \
nm-logging.h \
nm-manager-auth.c \ nm-manager-auth.c \
nm-manager-auth.h \ nm-manager-auth.h \
nm-auth-subject.c \ nm-auth-subject.c \
@@ -235,6 +229,8 @@ nm_sources = \
nm-manager.h \ nm-manager.h \
nm-policy.c \ nm-policy.c \
nm-policy.h \ nm-policy.h \
nm-posix-signals.c \
nm-posix-signals.h \
nm-properties-changed-signal.c \ nm-properties-changed-signal.c \
nm-properties-changed-signal.h \ nm-properties-changed-signal.h \
nm-rfkill-manager.c \ nm-rfkill-manager.c \

1
src/devices/adsl/Makefile.am
View File

@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/include \ -I${top_srcdir}/include \

1
src/devices/bluetooth/Makefile.am
View File

@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \ -I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \

2
src/devices/team/Makefile.am
View File

@@ -5,10 +5,8 @@ include $(GLIB_MAKEFILE)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/src/posix-signals \
-I${top_srcdir}/include \ -I${top_srcdir}/include \
-I${top_builddir}/libnm-util \ -I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \ -I${top_srcdir}/libnm-util \

1
src/devices/wifi/Makefile.am
View File

@@ -7,7 +7,6 @@ SUBDIRS=. tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \ -I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \

1
src/devices/wifi/tests/Makefile.am
View File

@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/logging \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/devices/wifi \ -I$(top_srcdir)/src/devices/wifi \

1
src/devices/wimax/Makefile.am
View File

@@ -1,7 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/include \ -I${top_srcdir}/include \

2
src/devices/wimax/iwmxsdk.c
View File

@@ -36,7 +36,7 @@
#include <WiMaxAPI.h> #include <WiMaxAPI.h>
#include <WiMaxAPIEx.h> #include <WiMaxAPIEx.h>
#include "logging/nm-logging.h" #include "nm-logging.h"
#include "iwmxsdk.h" #include "iwmxsdk.h"
static WIMAX_API_DEVICE_ID g_api; static WIMAX_API_DEVICE_ID g_api;

1
src/devices/wwan/Makefile.am
View File

@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \ -I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \

1
src/dhcp-manager/tests/Makefile.am
View File

@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/libnm-util \ -I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \ -I${top_builddir}/libnm-util \
-I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \

0
src/config/nm-config.c → src/nm-config.c
View File

0
src/config/nm-config.h → src/nm-config.h
View File

0
src/logging/nm-logging.c → src/nm-logging.c
View File

0
src/logging/nm-logging.h → src/nm-logging.h
View File

0
src/posix-signals/nm-posix-signals.c → src/nm-posix-signals.c
View File

0
src/posix-signals/nm-posix-signals.h → src/nm-posix-signals.h
View File

1
src/platform/tests/Makefile.am
View File

@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/include \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/libnm-util \ -I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \ -I${top_builddir}/libnm-util \
-I${srcdir}/.. \ -I${srcdir}/.. \

1
src/rdisc/tests/Makefile.am
View File

@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
-I${top_srcdir} \ -I${top_srcdir} \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/libnm-util \ -I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \ -I${top_builddir}/libnm-util \

2
src/settings/plugins/example/Makefile.am
View File

@@ -1,7 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \

3
src/settings/plugins/ifcfg-rh/Makefile.am
View File

@@ -26,11 +26,8 @@ libifcfg_rh_io_la_SOURCES = \
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/posix-signals \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \

2
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View File

@@ -11,10 +11,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/posix-signals \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

2
src/settings/plugins/ifnet/Makefile.am
View File

@@ -4,8 +4,6 @@ SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \

2
src/settings/plugins/ifnet/tests/Makefile.am
View File

@@ -8,8 +8,6 @@ AM_CPPFLAGS= \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \

2
src/settings/plugins/ifupdown/Makefile.am
View File

@@ -4,8 +4,6 @@ SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \

1
src/settings/plugins/ifupdown/tests/Makefile.am
View File

@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \

2
src/settings/plugins/keyfile/Makefile.am
View File

@@ -4,8 +4,6 @@ SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \

1
src/settings/plugins/keyfile/tests/Makefile.am
View File

@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \

3
src/tests/Makefile.am
View File

@@ -1,8 +1,9 @@
SUBDIRS = config
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

1
src/config/tests/Makefile.am → src/tests/config/Makefile.am
View File

@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/devices \ -I$(top_srcdir)/src/devices \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \

0
src/config/tests/NetworkManager.conf → src/tests/config/NetworkManager.conf
View File

0
src/config/tests/bad.conf → src/tests/config/bad.conf
View File

0
src/config/tests/conf.d/00-overrides.conf → src/tests/config/conf.d/00-overrides.conf
View File

0
src/config/tests/conf.d/10-more.conf → src/tests/config/conf.d/10-more.conf
View File

0
src/config/tests/conf.d/90-last.conf → src/tests/config/conf.d/90-last.conf
View File

0
src/config/tests/nm-test-device.c → src/tests/config/nm-test-device.c
View File

0
src/config/tests/nm-test-device.h → src/tests/config/nm-test-device.h
View File

0
src/config/tests/test-config.c → src/tests/config/test-config.c
View File