[network-manager-pptp/th/vpn-editor-split-bgo766623: 10/21] build: move "src/nm-pptp-service-defines.h" to "shared/nm-service-defines.h"

[Thomas Haller <thaller src gnome org>]

commit 57a7d3d282becaac189bd38e9b3d5638122fe7ec
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 18 18:03:32 2016 +0200

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

 Makefile.am                                        |    2 +-
 auth-dialog/Makefile.am                            |    3 ++-
 auth-dialog/main.c                                 |    2 +-
 configure.ac                                       |    1 +
 properties/Makefile.am                             |    2 +-
 properties/advanced-dialog.c                       |    2 +-
 properties/import-export.c                         |    2 +-
 properties/nm-pptp.c                               |    2 +-
 shared/Makefile.am                                 |    2 ++
 .../nm-service-defines.h                           |    6 +++---
 src/Makefile.am                                    |    5 +++--
 src/nm-pptp-service.h                              |    2 +-
 12 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f7eb24..66eaa9e 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 8ed8ed6..27cbe8f 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -6,7 +6,8 @@ nm_pptp_auth_dialog_CPPFLAGS = \
     $(GTK_CFLAGS) \
     $(LIBNMA_CFLAGS) \
     $(LIBSECRET_CFLAGS) \
-    -I${top_srcdir} \
+    -I"${top_srcdir}/shared/" \
+    -I"${top_srcdir}/src/" \
     -DICONDIR=\""$(datadir)/pixmaps"\" \
     -DUIDIR=\""$(uidir)"\" \
     -DBINDIR=\""$(bindir)"\"
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index a1a4e1a..82ff3ad 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -37,7 +37,7 @@
 #include <NetworkManager.h>
 #include <nma-vpn-password-dialog.h>
 
-#include "src/nm-pptp-service.h"
+#include "nm-service-defines.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
diff --git a/configure.ac b/configure.ac
index c9fbf0d..1fd7684 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,5 +113,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 b9862ef..909a2e0 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -20,7 +20,7 @@ ui_DATA = nm-pptp-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/advanced-dialog.c b/properties/advanced-dialog.c
index a2b4d1a..67332e5 100644
--- a/properties/advanced-dialog.c
+++ b/properties/advanced-dialog.c
@@ -46,7 +46,7 @@
 
 #include "advanced-dialog.h"
 #include "nm-pptp.h"
-#include "../src/nm-pptp-service-defines.h"
+#include "nm-service-defines.h"
 
 #define COL_NAME  0
 #define COL_VALUE 1
diff --git a/properties/import-export.c b/properties/import-export.c
index dda2645..5e94145 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -38,7 +38,7 @@
 
 #include "import-export.h"
 #include "nm-pptp.h"
-#include "../src/nm-pptp-service-defines.h"
+#include "nm-service-defines.h"
 
 NMConnection *
 do_import (const char *path, char **lines, GError **error)
diff --git a/properties/nm-pptp.c b/properties/nm-pptp.c
index 41c06ea..0fb8af6 100644
--- a/properties/nm-pptp.c
+++ b/properties/nm-pptp.c
@@ -48,7 +48,7 @@
 #include <nma-ui-utils.h>
 #endif
 
-#include "nm-pptp-service-defines.h"
+#include "nm-service-defines.h"
 #include "nm-pptp.h"
 #include "import-export.h"
 #include "advanced-dialog.h"
diff --git a/shared/Makefile.am b/shared/Makefile.am
new file mode 100644
index 0000000..d639bd8
--- /dev/null
+++ b/shared/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+    nm-service-defines.h
diff --git a/src/nm-pptp-service-defines.h b/shared/nm-service-defines.h
similarity index 95%
rename from src/nm-pptp-service-defines.h
rename to shared/nm-service-defines.h
index 38535fc..8550d83 100644
--- a/src/nm-pptp-service-defines.h
+++ b/shared/nm-service-defines.h
@@ -20,8 +20,8 @@
  * Copyright 2008, 2014 Red Hat, Inc.
  */
 
-#ifndef NM_PPTP_SERVICE_DEFINES_H
-#define NM_PPTP_SERVICE_DEFINES_H
+#ifndef __NM_SERVICE_DEFINES_H__
+#define __NM_SERVICE_DEFINES_H__
 
 #define NM_DBUS_SERVICE_PPTP    "org.freedesktop.NetworkManager.pptp"
 
@@ -53,4 +53,4 @@
 #define NM_PPTP_KEY_LCP_ECHO_INTERVAL "lcp-echo-interval"
 #define NM_PPTP_KEY_UNIT_NUM          "unit"
 
-#endif /* NM_PPTP_SERVICE_DEFINES_H */
+#endif /* __NM_SERVICE_DEFINES_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 09e128b..c02639a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
     $(GLIB_CFLAGS) \
     $(LIBNM_CFLAGS) \
-    -I${top_srcdir} \
+    -I"${top_srcdir}/shared/" \
     -DBINDIR=\"$(bindir)\" \
     -DPREFIX=\""$(prefix)"\" \
     -DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
 libexec_PROGRAMS = nm-pptp-service
 
 nm_pptp_service_SOURCES = \
-    nm-pptp-service-defines.h \
+    $(top_srcdir)/shared/nm-service-defines.h \
     nm-pptp-service.c \
     nm-pptp-service.h
 
@@ -52,6 +52,7 @@ nm_pptp_pppd_plugin_la_SOURCES = \
     nm-ppp-status.h
 
 nm_pptp_pppd_plugin_la_CPPFLAGS = \
+    -I"$(top_srcdir)/shared/" \
     $(GLIB_CFLAGS) \
     $(LIBNM_CFLAGS)
 
diff --git a/src/nm-pptp-service.h b/src/nm-pptp-service.h
index 8342d07..451c6be 100644
--- a/src/nm-pptp-service.h
+++ b/src/nm-pptp-service.h
@@ -28,7 +28,7 @@
 #include <NetworkManager.h>
 #include <nm-vpn-service-plugin.h>
 
-#include "nm-pptp-service-defines.h"
+#include "nm-service-defines.h"
 
 #define NM_TYPE_PPTP_PLUGIN            (nm_pptp_plugin_get_type ())
 #define NM_PPTP_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_PPTP_PLUGIN, 
NMPptpPlugin))