[network-manager-openconnect: 3/15] build: move "src/nm-openconnect-service.h" to "shared/nm-service-defines.h"

[Thomas Haller <thaller src gnome org>]

commit 0d7f2faf258cc1bd7b4591a38efc5cda308e9179
Author: Thomas Haller <thaller redhat com>
Date:   Tue Jun 14 16:40:49 2016 +0200

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

 auth-dialog/Makefile.am                            |    4 +++-
 auth-dialog/main.c                                 |    2 +-
 properties/auth-helpers.c                          |    2 +-
 properties/nm-openconnect.c                        |    2 +-
 shared/Makefile.am                                 |    1 +
 .../nm-service-defines.h                           |    6 +++---
 src/Makefile.am                                    |    6 ++++--
 src/nm-openconnect-service.h                       |    2 +-
 8 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index c90a990..96a651c 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -9,7 +9,9 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
        $(LIBSECRET_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"
+       -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+       -I"$(top_srcdir)/shared" \
+       $(NULL)
 
 nm_openconnect_auth_dialog_SOURCES = \
        main.c \
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index fdf7a9d..4f31ee6 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -46,7 +46,7 @@
 #define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
-#include "../src/nm-openconnect-service-defines.h"
+#include "nm-service-defines.h"
 
 #include "openconnect.h"
 
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index db47443..5fa3384 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -37,7 +37,7 @@
 
 #include "auth-helpers.h"
 #include "nm-openconnect.h"
-#include "../src/nm-openconnect-service-defines.h"
+#include "nm-service-defines.h"
 
 void
 tls_pw_init_auth_widget (GtkBuilder *builder,
diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c
index 46ecab6..b764c0f 100644
--- a/properties/nm-openconnect.c
+++ b/properties/nm-openconnect.c
@@ -72,7 +72,7 @@
 #define OPENCONNECT_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY  NM_CONNECTION_ERROR_INVALID_PROPERTY
 #endif
 
-#include "nm-openconnect-service-defines.h"
+#include "nm-service-defines.h"
 #include "nm-openconnect.h"
 #include "auth-helpers.h"
 
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 7896aa5..a80fc41 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -2,4 +2,5 @@ EXTRA_DIST = \
     nm-utils/gsystem-local-alloc.h \
     nm-utils/nm-macros-internal.h \
     nm-utils/nm-vpn-editor-plugin-call.h \
+    nm-service-defines.h \
     $(NULL)
diff --git a/src/nm-openconnect-service-defines.h b/shared/nm-service-defines.h
similarity index 94%
rename from src/nm-openconnect-service-defines.h
rename to shared/nm-service-defines.h
index 6853505..08fca3b 100644
--- a/src/nm-openconnect-service-defines.h
+++ b/shared/nm-service-defines.h
@@ -22,8 +22,8 @@
  *   Copyright © 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_OPENCONNECT_SERVICE_DEFINES_H
-#define NM_OPENCONNECT_SERVICE_DEFINES_H
+#ifndef __NM_SERVICE_DEFINES_H__
+#define __NM_SERVICE_DEFINES_H__
 
 #define NM_VPN_SERVICE_TYPE_OPENCONNECT "org.freedesktop.NetworkManager.openconnect"
 
@@ -47,4 +47,4 @@
 #define NM_OPENCONNECT_KEY_TOKEN_MODE "stoken_source"
 #define NM_OPENCONNECT_KEY_TOKEN_SECRET "stoken_string"
 
-#endif /* NM_OPENCONNECT_SERVICE_DEFINES_H */
+#endif /* __NM_SERVICE_DEFINES_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index db99b7f..af31676 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,9 @@ AM_CPPFLAGS = \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        -DLOCALSTATEDIR=\""$(localstatedir)"\" \
        -DDATADIR=\"$(datadir)\" \
-       -DNM_OPENCONNECT_LOCALEDIR=\"$(datadir)/locale\"
+       -DNM_OPENCONNECT_LOCALEDIR=\"$(datadir)/locale\" \
+       -I"$(top_srcdir)"/shared \
+       $(NULL)
 
 libexec_PROGRAMS = \
        nm-openconnect-service \
@@ -17,7 +19,7 @@ libexec_PROGRAMS = \
 nm_openconnect_service_SOURCES = \
        nm-openconnect-service.c \
        nm-openconnect-service.h \
-       nm-openconnect-service-defines.h
+       $(NULL)
 
 nm_openconnect_service_LDADD = \
        $(GLIB_LIBS) \
diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
index 81a3e96..a674843 100644
--- a/src/nm-openconnect-service.h
+++ b/src/nm-openconnect-service.h
@@ -29,7 +29,7 @@
 #include <NetworkManager.h>
 #include <nm-vpn-service-plugin.h>
 
-#include "nm-openconnect-service-defines.h"
+#include "nm-service-defines.h"
 
 #define NM_TYPE_OPENCONNECT_PLUGIN            (nm_openconnect_plugin_get_type ())
 #define NM_OPENCONNECT_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NM_TYPE_OPENCONNECT_PLUGIN, NMOpenconnectPlugin))