diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-15 15:29:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-16 10:45:53 +0200 |
| commit | 4b288136e1893a7ac21f04370008e37feb3cfac9 (patch) | |
| tree | 7735e8433e0e803e22d11d3773546fba6c8ae342 /shared | |
| parent | b6b84d0442809d1b127c4bb36f09445ece2ac262 (diff) | |
| download | NetworkManager-4b288136e1893a7ac21f04370008e37feb3cfac9.tar.gz | |
shared: move shared files to subdirectory "shared/nm-utils/"
The "shared" directory contains files that are possibly used by all components
of NetworkManager repository.
Some of these files are even copied as-is to other projects (VPN plugins, nm-applet)
and used there without modification. Move those files to a separate directory.
By moving them to a common directory, it is clearer that they belong
together. Also, you can easier compare the copied versions to their
original via
$ diff -r ./shared/nm-utils/ /path/to/nm-vpn-plugin/shared/nm-utils/
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/Makefile.am | 15 | ||||
| -rw-r--r-- | shared/nm-default.h | 8 | ||||
| -rw-r--r-- | shared/nm-test-libnm-utils.h | 2 | ||||
| -rw-r--r-- | shared/nm-utils/gsystem-local-alloc.h (renamed from shared/gsystem-local-alloc.h) | 0 | ||||
| -rw-r--r-- | shared/nm-utils/nm-glib.h (renamed from shared/nm-glib.h) | 0 | ||||
| -rw-r--r-- | shared/nm-utils/nm-macros-internal.h (renamed from shared/nm-macros-internal.h) | 0 | ||||
| -rw-r--r-- | shared/nm-utils/nm-shared-utils.c (renamed from shared/nm-shared-utils.c) | 0 | ||||
| -rw-r--r-- | shared/nm-utils/nm-shared-utils.h (renamed from shared/nm-shared-utils.h) | 0 | ||||
| -rw-r--r-- | shared/nm-utils/nm-test-utils.h (renamed from shared/nm-test-utils.h) | 0 | ||||
| -rw-r--r-- | shared/nm-utils/nm-vpn-editor-plugin-call.h (renamed from shared/nm-vpn-editor-plugin-call.h) | 0 |
10 files changed, 13 insertions, 12 deletions
diff --git a/shared/Makefile.am b/shared/Makefile.am index 01818d0cd1..41df29a32b 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -1,16 +1,17 @@ EXTRA_DIST = \ - gsystem-local-alloc.h \ + nm-utils/gsystem-local-alloc.h \ + nm-utils/nm-glib.h \ + nm-utils/nm-macros-internal.h \ + nm-utils/nm-shared-utils.c \ + nm-utils/nm-shared-utils.h \ + nm-utils/nm-test-utils.h \ + nm-utils/nm-vpn-editor-plugin-call.h \ nm-common-macros.h \ nm-dbus-compat.h \ nm-default.h \ - nm-glib.h \ - nm-macros-internal.h \ - nm-shared-utils.c \ - nm-shared-utils.h \ nm-test-libnm-utils.h \ - nm-test-utils.h \ nm-test-utils-impl.c \ nm-version-macros.h.in \ - nm-vpn-editor-plugin-call.h + $(NULL) CLEANFILES=nm-version.h diff --git a/shared/nm-default.h b/shared/nm-default.h index 5d7c8f141c..bcd3d420c2 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -98,11 +98,11 @@ _nm_g_return_if_fail_warning (const char *log_domain, /*****************************************************************************/ -#include "nm-glib.h" +#include "nm-utils/nm-glib.h" #include "nm-version.h" -#include "gsystem-local-alloc.h" -#include "nm-macros-internal.h" -#include "nm-shared-utils.h" +#include "nm-utils/gsystem-local-alloc.h" +#include "nm-utils/nm-macros-internal.h" +#include "nm-utils/nm-shared-utils.h" /*****************************************************************************/ diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h index 8d111003aa..192c089e10 100644 --- a/shared/nm-test-libnm-utils.h +++ b/shared/nm-test-libnm-utils.h @@ -20,7 +20,7 @@ #include "NetworkManager.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" /*****************************************************************************/ diff --git a/shared/gsystem-local-alloc.h b/shared/nm-utils/gsystem-local-alloc.h index 51b6251974..51b6251974 100644 --- a/shared/gsystem-local-alloc.h +++ b/shared/nm-utils/gsystem-local-alloc.h diff --git a/shared/nm-glib.h b/shared/nm-utils/nm-glib.h index 5f8ebc7fdc..5f8ebc7fdc 100644 --- a/shared/nm-glib.h +++ b/shared/nm-utils/nm-glib.h diff --git a/shared/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index 4622af9fd8..4622af9fd8 100644 --- a/shared/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h diff --git a/shared/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c index 38f6529d2a..38f6529d2a 100644 --- a/shared/nm-shared-utils.c +++ b/shared/nm-utils/nm-shared-utils.c diff --git a/shared/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h index cfa8f994f7..cfa8f994f7 100644 --- a/shared/nm-shared-utils.h +++ b/shared/nm-utils/nm-shared-utils.h diff --git a/shared/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index 83e1f47e47..83e1f47e47 100644 --- a/shared/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h diff --git a/shared/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h index c6b7ee76ab..c6b7ee76ab 100644 --- a/shared/nm-vpn-editor-plugin-call.h +++ b/shared/nm-utils/nm-vpn-editor-plugin-call.h |