[network-manager-vpnc/th/vpn-editor-split-bgo766170] build: move copied shared files to separate directory

[Thomas Haller <thaller src gnome org>]

commit c606095427584d67597a883f70b27cf1148ea20d
Author: Thomas Haller <thaller redhat com>
Date:   Fri May 13 14:46:10 2016 +0200

    build: move copied shared files to separate directory
    
    Some of the shared files are copied as-is from NetworkManager's
    repository or between VPN plugins. Those files are special, in that
    they are not supposed to be edited locally, without considering that
    they are used in other projects.
    
    Move them to a separate sub-directory, to make the nature of these
    files clearer.

 properties/nm-vpnc-editor-plugin.c          |    2 +-
 properties/tests/test-import-export.c       |    2 +-
 shared/Makefile.am                          |   16 ++++++++--------
 shared/README                               |   16 ++++++++--------
 shared/nm-default.h                         |    7 ++++---
 shared/{ => nm-utils}/gsystem-local-alloc.h |    0
 shared/{ => nm-utils}/nm-glib.h             |    0
 shared/{ => nm-utils}/nm-macros-internal.h  |    0
 shared/{ => nm-utils}/nm-shared-utils.c     |    0
 shared/{ => nm-utils}/nm-shared-utils.h     |    0
 shared/{ => nm-utils}/nm-test-utils.h       |    0
 shared/{ => nm-vpn}/nm-vpn-plugin-utils.c   |    0
 shared/{ => nm-vpn}/nm-vpn-plugin-utils.h   |    0
 src/test-vpnc-output.c                      |    2 +-
 14 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/properties/nm-vpnc-editor-plugin.c b/properties/nm-vpnc-editor-plugin.c
index 66531b4..ffa8ee4 100644
--- a/properties/nm-vpnc-editor-plugin.c
+++ b/properties/nm-vpnc-editor-plugin.c
@@ -38,7 +38,7 @@
 #ifdef NM_VPN_OLD
 #include "nm-vpnc-editor.h"
 #else
-#include "nm-vpn-plugin-utils.h"
+#include "nm-vpn/nm-vpn-plugin-utils.h"
 #endif
 
 #define VPNC_PLUGIN_NAME    _("Cisco Compatible VPN (vpnc)")
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index b11bd45..ae3e6a6 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -31,7 +31,7 @@
 #include "nm-vpnc-editor.h"
 #include "nm-vpnc-helper.h"
 
-#include "nm-test-utils.h"
+#include "nm-utils/nm-test-utils.h"
 
 #define SRCDIR TEST_SRCDIR"/pcf"
 #define TMPDIR TEST_BUILDDIR"/pcf-tmp"
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 5e8461c..f8efbfb 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -6,8 +6,8 @@ noinst_LTLIBRARIES += libnm-vpnc-shared.la
 endif
 
 shared_sources = \
-    nm-shared-utils.c \
-    nm-shared-utils.h \
+    nm-utils/nm-shared-utils.c \
+    nm-utils/nm-shared-utils.h \
     nm-service-defines.h
 
 ###############################################################################
@@ -42,8 +42,8 @@ libnm_vpn_editor_utils_shared_la_CPPFLAGS = \
     -I$(top_srcdir)/shared
 
 libnm_vpn_editor_utils_shared_la_SOURCES = \
-    nm-vpn-plugin-utils.c \
-    nm-vpn-plugin-utils.h
+    nm-vpn/nm-vpn-plugin-utils.c \
+    nm-vpn/nm-vpn-plugin-utils.h
 
 libnm_vpn_editor_utils_shared_la_LIBADD = \
     $(LIBNM_LIBS) \
@@ -52,9 +52,9 @@ libnm_vpn_editor_utils_shared_la_LIBADD = \
 ###############################################################################
 
 EXTRA_DIST = \
-    gsystem-local-alloc.h \
     nm-default.h \
-    nm-glib.h \
-    nm-macros-internal.h \
-    nm-test-utils.h
+    nm-utils/gsystem-local-alloc.h \
+    nm-utils/nm-glib.h \
+    nm-utils/nm-macros-internal.h \
+    nm-utils/nm-test-utils.h
 
diff --git a/shared/README b/shared/README
index eaf4409..e7a2dff 100644
--- a/shared/README
+++ b/shared/README
@@ -2,18 +2,18 @@ The files in the "shared/" directory are supposed to be shared
 across NetworkManager related projects (reuse-by-copying).
 
 (1) the files
-    shared/gsystem-local-alloc.h
-    shared/nm-glib.h
-    shared/nm-macros-internal.h
-    shared/nm-shared-utils.c
-    shared/nm-shared-utils.h
-    shared/nm-test-utils.h
+    shared/nm-utils/gsystem-local-alloc.h
+    shared/nm-utils/nm-glib.h
+    shared/nm-utils/nm-macros-internal.h
+    shared/nm-utils/nm-shared-utils.c
+    shared/nm-utils/nm-shared-utils.h
+    shared/nm-utils/nm-test-utils.h
 are copied as-is from NetworkManager
   
https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/shared?id=9770024f63b85da604f1134a8bc8dc968278dcd1
 
 2) the files
-    shared/nm-vpn-plugin-utils.c
-    shared/nm-vpn-plugin-utils.h
+    shared/nm-vpn/nm-vpn-plugin-utils.c
+    shared/nm-vpn/nm-vpn-plugin-utils.h
 are copied as-is from nm-openvpn
   
https://git.gnome.org/browse/network-manager-openvpn/tree/shared?id=3d0ac3ca94b4bf24f77306cef5a95172ddaf5fc4
 
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 2fbd1a6..c8317db 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -42,10 +42,11 @@
 
 /* always include these headers for our internal source files. */
 
-#include "nm-glib.h"
+#include "nm-utils/nm-glib.h"
+#include "nm-utils/gsystem-local-alloc.h"
+#include "nm-utils/nm-macros-internal.h"
+
 #include "nm-version.h"
-#include "gsystem-local-alloc.h"
-#include "nm-macros-internal.h"
 #include "nm-service-defines.h"
 
 /*****************************************************************************/
diff --git a/shared/gsystem-local-alloc.h b/shared/nm-utils/gsystem-local-alloc.h
similarity index 100%
rename from shared/gsystem-local-alloc.h
rename to shared/nm-utils/gsystem-local-alloc.h
diff --git a/shared/nm-glib.h b/shared/nm-utils/nm-glib.h
similarity index 100%
rename from shared/nm-glib.h
rename to shared/nm-utils/nm-glib.h
diff --git a/shared/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h
similarity index 100%
rename from shared/nm-macros-internal.h
rename to shared/nm-utils/nm-macros-internal.h
diff --git a/shared/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c
similarity index 100%
rename from shared/nm-shared-utils.c
rename to shared/nm-utils/nm-shared-utils.c
diff --git a/shared/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h
similarity index 100%
rename from shared/nm-shared-utils.h
rename to shared/nm-utils/nm-shared-utils.h
diff --git a/shared/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
similarity index 100%
rename from shared/nm-test-utils.h
rename to shared/nm-utils/nm-test-utils.h
diff --git a/shared/nm-vpn-plugin-utils.c b/shared/nm-vpn/nm-vpn-plugin-utils.c
similarity index 100%
rename from shared/nm-vpn-plugin-utils.c
rename to shared/nm-vpn/nm-vpn-plugin-utils.c
diff --git a/shared/nm-vpn-plugin-utils.h b/shared/nm-vpn/nm-vpn-plugin-utils.h
similarity index 100%
rename from shared/nm-vpn-plugin-utils.h
rename to shared/nm-vpn/nm-vpn-plugin-utils.h
diff --git a/src/test-vpnc-output.c b/src/test-vpnc-output.c
index 2d0873f..7e3a924 100644
--- a/src/test-vpnc-output.c
+++ b/src/test-vpnc-output.c
@@ -24,7 +24,7 @@
 
 #include "utils.h"
 
-#include "nm-test-utils.h"
+#include "nm-utils/nm-test-utils.h"
 
 #define TEST_HEADER \
        GString *output;\