diff options
-rw-r--r-- | Makefile.am | 26 | ||||
-rw-r--r-- | src/devices/adsl/nm-device-adsl.c | 4 | ||||
-rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-ethernet.c | 4 | ||||
-rw-r--r-- | src/devices/wwan/nm-modem.c | 2 | ||||
-rw-r--r-- | src/devices/wwan/nm-modem.h | 2 | ||||
-rw-r--r-- | src/ppp/nm-ppp-manager.c (renamed from src/ppp-manager/nm-ppp-manager.c) | 0 | ||||
-rw-r--r-- | src/ppp/nm-ppp-manager.h (renamed from src/ppp-manager/nm-ppp-manager.h) | 0 | ||||
-rw-r--r-- | src/ppp/nm-ppp-status.h (renamed from src/ppp-manager/nm-ppp-status.h) | 0 | ||||
-rw-r--r-- | src/ppp/nm-pppd-plugin.c (renamed from src/ppp-manager/nm-pppd-plugin.c) | 0 | ||||
-rw-r--r-- | src/ppp/nm-pppd-plugin.h (renamed from src/ppp-manager/nm-pppd-plugin.h) | 0 |
11 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index cac41b2047..814f0a97dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -956,7 +956,7 @@ src_cppflags = \ -I$(top_srcdir)/src/dnsmasq \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform/wifi \ - -I$(top_srcdir)/src/ppp-manager \ + -I$(top_srcdir)/src/ppp \ -I$(top_srcdir)/src/ndisc \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/supplicant \ @@ -1315,9 +1315,9 @@ src_libNetworkManager_la_SOURCES = \ src/dnsmasq/nm-dnsmasq-utils.c \ src/dnsmasq/nm-dnsmasq-utils.h \ \ - src/ppp-manager/nm-ppp-manager.c \ - src/ppp-manager/nm-ppp-manager.h \ - src/ppp-manager/nm-ppp-status.h \ + src/ppp/nm-ppp-manager.c \ + src/ppp/nm-ppp-manager.h \ + src/ppp/nm-ppp-status.h \ \ src/settings/nm-agent-manager.c \ src/settings/nm-agent-manager.h \ @@ -1560,14 +1560,14 @@ EXTRA_DIST += \ src/dhcp/tests/leases/malformed3.leases ############################################################################### -# src/ppp-manager +# src/ppp ############################################################################### if WITH_PPP -pppd_plugin_LTLIBRARIES += src/ppp-manager/nm-pppd-plugin.la +pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la -src_ppp_manager_nm_pppd_plugin_la_CPPFLAGS = \ +src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ -I${top_srcdir}/shared \ -I${top_builddir}/shared \ -I${top_srcdir}/libnm-core \ @@ -1577,15 +1577,15 @@ src_ppp_manager_nm_pppd_plugin_la_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) -src_ppp_manager_nm_pppd_plugin_la_SOURCES = \ - src/ppp-manager/nm-pppd-plugin.c \ - src/ppp-manager/nm-pppd-plugin.h \ - src/ppp-manager/nm-ppp-status.h +src_ppp_nm_pppd_plugin_la_SOURCES = \ + src/ppp/nm-pppd-plugin.c \ + src/ppp/nm-pppd-plugin.h \ + src/ppp/nm-ppp-status.h -src_ppp_manager_nm_pppd_plugin_la_LDFLAGS = \ +src_ppp_nm_pppd_plugin_la_LDFLAGS = \ -module -avoid-version -src_ppp_manager_nm_pppd_plugin_la_LIBADD = \ +src_ppp_nm_pppd_plugin_la_LIBADD = \ $(GLIB_LIBS) \ $(DL_LIBS) diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 97552950b4..07eb7a2e7f 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -34,8 +34,8 @@ #include "nm-device-private.h" #include "nm-platform.h" -#include "ppp-manager/nm-ppp-manager.h" -#include "ppp-manager/nm-ppp-status.h" +#include "ppp/nm-ppp-manager.h" +#include "ppp/nm-ppp-status.h" #include "nm-setting-adsl.h" #include "nm-utils.h" diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 1ffe9597fe..d5ae399470 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -28,7 +28,7 @@ #include "nm-bluez-common.h" #include "nm-bluez-device.h" #include "nm-device-private.h" -#include "ppp-manager/nm-ppp-manager.h" +#include "ppp/nm-ppp-manager.h" #include "nm-setting-connection.h" #include "nm-setting-bluetooth.h" #include "nm-setting-cdma.h" diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 6a1f8034f7..c1c63f1608 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -38,8 +38,8 @@ #include "nm-supplicant-manager.h" #include "nm-supplicant-interface.h" #include "nm-supplicant-config.h" -#include "ppp-manager/nm-ppp-manager.h" -#include "ppp-manager/nm-ppp-status.h" +#include "ppp/nm-ppp-manager.h" +#include "ppp/nm-ppp-status.h" #include "nm-platform.h" #include "nm-platform-utils.h" #include "nm-dcb.h" diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 6e7e403c0d..be35eee39c 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -36,7 +36,7 @@ #include "nm-act-request.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" -#include "ppp-manager/nm-ppp-status.h" +#include "ppp/nm-ppp-status.h" /*****************************************************************************/ diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index 299c9bf8d0..97c4e4cc73 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_MODEM_H__ #define __NETWORKMANAGER_MODEM_H__ -#include "ppp-manager/nm-ppp-manager.h" +#include "ppp/nm-ppp-manager.h" #include "nm-device.h" #define NM_TYPE_MODEM (nm_modem_get_type ()) diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index 9b212a1acb..9b212a1acb 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp/nm-ppp-manager.h index 12748176a3..12748176a3 100644 --- a/src/ppp-manager/nm-ppp-manager.h +++ b/src/ppp/nm-ppp-manager.h diff --git a/src/ppp-manager/nm-ppp-status.h b/src/ppp/nm-ppp-status.h index 391b5aa986..391b5aa986 100644 --- a/src/ppp-manager/nm-ppp-status.h +++ b/src/ppp/nm-ppp-status.h diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp/nm-pppd-plugin.c index 9c47c339a3..9c47c339a3 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp/nm-pppd-plugin.c diff --git a/src/ppp-manager/nm-pppd-plugin.h b/src/ppp/nm-pppd-plugin.h index 1a2ea09e94..1a2ea09e94 100644 --- a/src/ppp-manager/nm-pppd-plugin.h +++ b/src/ppp/nm-pppd-plugin.h |