[network-manager-libreswan/th/vpn-editor-split-bgo766623: 2/18] build: move "src/nm-libreswan-service.h" to "shared/nm-service-defines.h"

[Thomas Haller <thaller src gnome org>]

commit 9ea352c4ecf4758b92b36e460b2415ecfc626f89
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 10 09:29:31 2016 +0200

    build: move "src/nm-libreswan-service.h" to "shared/nm-service-defines.h"

 Makefile.am                                        |    2 +-
 auth-dialog/Makefile.am                            |    1 +
 auth-dialog/main.c                                 |    2 +-
 common/Makefile.am                                 |    2 +-
 common/utils.c                                     |    2 +-
 configure.ac                                       |    1 +
 properties/Makefile.am                             |    2 +-
 properties/nm-libreswan.c                          |    2 +-
 shared/Makefile.am                                 |    2 ++
 .../nm-service-defines.h                           |    6 +++---
 src/Makefile.am                                    |    4 ++--
 src/nm-libreswan-service-helper.c                  |    4 ++--
 src/nm-libreswan-service.c                         |    2 +-
 13 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2bf09c8..7a67d74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = common src
+SUBDIRS = shared common src
 
 if WITH_GNOME
 SUBDIRS += auth-dialog properties po
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 4044b69..ed0e52b 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
        $(LIBNMA_CFLAGS) \
        $(GTK_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 5e68300..da5e221 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -37,7 +37,7 @@
 #include <nm-vpn-service-plugin.h>
 #include <nma-vpn-password-dialog.h>
 
-#include <../src/nm-libreswan-service.h>
+#include "nm-service-defines.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
diff --git a/common/Makefile.am b/common/Makefile.am
index 627d9dd..5cce395 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -12,7 +12,7 @@ libnm_vpn_plugin_libreswan_common_la_SOURCES = \
 
 common_CPPFLAGS = \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
-       -I$(top_srcdir)/src/
+       -I"$(top_srcdir)/shared/"
 
 libnm_libreswan_common_la_CPPFLAGS = \
        $(LIBNM_CFLAGS) \
diff --git a/common/utils.c b/common/utils.c
index 2ef0bb1..3219dab 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -32,7 +32,7 @@
 #define nm_simple_connection_new nm_connection_new
 #endif
 
-#include "nm-libreswan-service.h"
+#include "nm-service-defines.h"
 #include "utils.h"
 
 gboolean debug = FALSE;
diff --git a/configure.ac b/configure.ac
index 8001f65..15552ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,5 +118,6 @@ src/Makefile
 auth-dialog/Makefile
 properties/Makefile
 po/Makefile.in
+shared/Makefile
 ])
 AC_OUTPUT
diff --git a/properties/Makefile.am b/properties/Makefile.am
index b7f19d0..ee96307 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -7,7 +7,7 @@ endif
 common_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       -I$(top_srcdir)/src \
+       -I"$(top_srcdir)/shared/" \
        -I$(top_srcdir)/common \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
diff --git a/properties/nm-libreswan.c b/properties/nm-libreswan.c
index c3dc988..12b9b37 100644
--- a/properties/nm-libreswan.c
+++ b/properties/nm-libreswan.c
@@ -57,7 +57,7 @@
 #define LIBRESWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
 #endif
 
-#include "nm-libreswan-service.h"
+#include "nm-service-defines.h"
 #include "nm-libreswan.h"
 #include "utils.h"
 
diff --git a/shared/Makefile.am b/shared/Makefile.am
new file mode 100644
index 0000000..e0219d4
--- /dev/null
+++ b/shared/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+       nm-service-defines.h
diff --git a/src/nm-libreswan-service.h b/shared/nm-service-defines.h
similarity index 95%
rename from src/nm-libreswan-service.h
rename to shared/nm-service-defines.h
index cba0c62..5efa99b 100644
--- a/src/nm-libreswan-service.h
+++ b/shared/nm-service-defines.h
@@ -18,8 +18,8 @@
  * (C) Copyright 2010 Red Hat, Inc.
  */
 
-#ifndef NM_LIBRESWAN_PLUGIN_H
-#define NM_LIBRESWAN_PLUGIN_H
+#ifndef __NM_SERVICE_DEFINES_H__
+#define __NM_SERVICE_DEFINES_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -57,4 +57,4 @@
 #define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE "_none_"
 #endif
 
-#endif /* NM_LIBRESWAN_PLUGIN_H */
+#endif /* __NM_SERVICE_DEFINES_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 07736e9..401cccb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
        -DLOCALSTATEDIR=\""$(localstatedir)"\" \
        -DDATADIR=\"$(datadir)\" \
        -DNM_LIBRESWAN_LOCALEDIR=\"$(datadir)/locale\" \
+       -I"$(top_srcdir)/shared/" \
        -I$(top_srcdir)/common/
 
 libexec_PROGRAMS = nm-libreswan-service nm-libreswan-service-helper
@@ -34,8 +35,7 @@ nm-libreswan-helper-service-dbus.c:
        @true
 
 nm_libreswan_service_SOURCES = \
-       nm-libreswan-service.c \
-       nm-libreswan-service.h
+       nm-libreswan-service.c
 
 nm_libreswan_service_LDADD = \
        $(GLIB_LIBS) \
diff --git a/src/nm-libreswan-service-helper.c b/src/nm-libreswan-service-helper.c
index 0f7679d..8855619 100644
--- a/src/nm-libreswan-service-helper.c
+++ b/src/nm-libreswan-service-helper.c
@@ -25,9 +25,9 @@
 #include <string.h>
 
 #include "nm-libreswan-helper-service-dbus.h"
-#include "nm-libreswan-service.h"
+#include "nm-service-defines.h"
 
-int 
+int
 main (int argc, char *argv[])
 {
        NMDBusLibreswanHelper *proxy;
diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c
index cd507e1..ece97cd 100644
--- a/src/nm-libreswan-service.c
+++ b/src/nm-libreswan-service.c
@@ -54,7 +54,7 @@
 #include <nm-vpn-service-plugin.h>
 
 #include "nm-libreswan-helper-service-dbus.h"
-#include "nm-libreswan-service.h"
+#include "nm-service-defines.h"
 #include "nm-utils.h"
 #include "utils.h"