[network-manager-vpnc/th/vpn-editor-split-bgo766170: 2/20] build: move "nm-vpnc-service-defines.h" to "shared/" directory

[Thomas Haller <thaller src gnome org>]

commit 79de084f16d8647a953a8376bc5deebd534d12ea
Author: Thomas Haller <thaller redhat com>
Date:   Sun May 8 21:59:40 2016 +0200

    build: move "nm-vpnc-service-defines.h" to "shared/" directory

 Makefile.am                               |    2 +-
 auth-dialog/Makefile.am                   |    1 +
 auth-dialog/main.c                        |    2 +-
 configure.ac                              |    1 +
 properties/Makefile.am                    |    2 +-
 properties/tests/Makefile.am              |    3 ++-
 properties/tests/test-import-export.c     |    2 +-
 shared/Makefile.am                        |    2 ++
 {src => shared}/nm-vpnc-service-defines.h |    0
 src/Makefile.am                           |    5 +++--
 10 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 783a4db..a60467a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = src
+SUBDIRS = shared src
 
 if WITH_GNOME
 SUBDIRS += auth-dialog properties po
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 9add74a..1bf484e 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -6,6 +6,7 @@ nm_vpnc_auth_dialog_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBNMA_CFLAGS) \
        $(LIBSECRET_CFLAGS) \
+       -I"$(top_srcdir)/shared/" \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index d07526c..530f362 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -35,7 +35,7 @@
 #include <nm-vpn-service-plugin.h>
 #include <nma-vpn-password-dialog.h>
 
-#include "../src/nm-vpnc-service-defines.h"
+#include "nm-vpnc-service-defines.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
diff --git a/configure.ac b/configure.ac
index f90712e..f8dba0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,7 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
+shared/Makefile
 src/Makefile
 auth-dialog/Makefile
 properties/Makefile
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 3a886b9..82ce18b 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -21,7 +21,7 @@ ui_DATA = nm-vpnc-dialog.ui
 common_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       -I$(top_srcdir)/src/ \
+       -I"$(top_srcdir)/shared/" \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
        -DLOCALEDIR=\"$(datadir)/locale\"
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index d3ae761..083ce54 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -10,7 +10,8 @@ test_import_export_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBNM_CFLAGS) \
        $(LIBNMA_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS) \
+       -I"$(top_srcdir)/shared/"
 
 test_import_export_LDADD = \
        $(GTHREAD_LIBS) \
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 243bbae..ef224c0 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -32,7 +32,7 @@
 
 #include "../../nm-test-helpers.h"
 #include "../../properties/nm-vpnc.h"
-#include "../../src/nm-vpnc-service-defines.h"
+#include "nm-vpnc-service-defines.h"
 #include "../../properties/nm-vpnc-helper.h"
 
 typedef struct {
diff --git a/shared/Makefile.am b/shared/Makefile.am
new file mode 100644
index 0000000..2075357
--- /dev/null
+++ b/shared/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+    nm-vpnc-service-defines.h
diff --git a/src/nm-vpnc-service-defines.h b/shared/nm-vpnc-service-defines.h
similarity index 100%
rename from src/nm-vpnc-service-defines.h
rename to shared/nm-vpnc-service-defines.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f71c269..1263d1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBNM_CFLAGS) \
+       -I"$(top_srcdir)/shared/" \
        -DBINDIR=\"$(bindir)\" \
        -DPREFIX=\""$(prefix)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -13,9 +14,9 @@ AM_CPPFLAGS = \
 libexec_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
 
 nm_vpnc_service_SOURCES = \
+       $(top_srcdir)/shared/nm-vpnc-service-defines.h \
        nm-vpnc-service.c \
        nm-vpnc-service.h \
-       nm-vpnc-service-defines.h \
        utils.c \
        utils.h
 
@@ -25,7 +26,7 @@ nm_vpnc_service_LDADD = \
 
 
 nm_vpnc_service_vpnc_helper_SOURCES = \
-                               nm-vpnc-service-vpnc-helper.c
+       nm-vpnc-service-vpnc-helper.c
 
 nm_vpnc_service_vpnc_helper_LDADD = \
        $(GTHREAD_LIBS) \