shared: move shared files to subdirectory "shared/nm-utils/"

System Internals / NetworkManager - Thomas Haller [redhat.com] - 16 June 2016 03:45 UTC

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/

4b28813 shared: move shared files to subdirectory "shared/nm-utils/"
callouts/tests/test-dispatcher-envp.c | 2 +-
libnm-core/Makefile.libnm-core | 4 +-
libnm-core/tests/test-compare.c | 2 +-
libnm-core/tests/test-crypto.c | 2 +-
libnm-core/tests/test-general.c | 2 +-
libnm-core/tests/test-keyfile.c | 2 +-
libnm-core/tests/test-secrets.c | 2 +-
libnm-core/tests/test-setting-8021x.c | 2 +-
libnm-core/tests/test-setting-bond.c | 2 +-
libnm-core/tests/test-setting-dcb.c | 2 +-
libnm-core/tests/test-settings-defaults.c | 2 +-
libnm-util/Makefile.am | 4 +-
libnm-util/tests/test-crypto.c | 2 +-
libnm-util/tests/test-general.c | 2 +-
libnm-util/tests/test-secrets.c | 2 +-
libnm-util/tests/test-setting-8021x.c | 2 +-
libnm-util/tests/test-setting-dcb.c | 2 +-
libnm-util/tests/test-settings-defaults.c | 2 +-
libnm/nm-vpn-service-plugin.c | 2 +-
po/POTFILES.in | 2 +-
po/POTFILES.skip | 2 +-
shared/Makefile.am | 15 +-
shared/gsystem-local-alloc.h | 208 ----
shared/nm-default.h | 8 +-
shared/nm-glib.h | 395 ------
shared/nm-macros-internal.h | 604 ---------
shared/nm-shared-utils.c | 239 ----
shared/nm-shared-utils.h | 66 -
shared/nm-test-libnm-utils.h | 2 +-
shared/nm-test-utils.h | 1753 ---------------------------
shared/nm-utils/gsystem-local-alloc.h | 208 ++++
shared/nm-utils/nm-glib.h | 395 ++++++
shared/nm-utils/nm-macros-internal.h | 604 +++++++++
shared/nm-utils/nm-shared-utils.c | 239 ++++
shared/nm-utils/nm-shared-utils.h | 66 +
shared/nm-utils/nm-test-utils.h | 1753 +++++++++++++++++++++++++++
shared/nm-utils/nm-vpn-editor-plugin-call.h | 189 +++
shared/nm-vpn-editor-plugin-call.h | 189 ---
src/nm-test-utils-core.h | 2 +-
39 files changed, 3491 insertions(+), 3490 deletions(-)

Upstream: cgit.freedesktop.org


  • Share