[network-manager-openvpn] shared: rename "nm-openvpn-service-defines.h" to "nm-service-defines.h"

[Thomas Haller <thaller src gnome org>]

commit a5712d0306b22ae0331ac8bc3a186b6122b0e69d
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 11 10:52:33 2016 +0200

    shared: rename "nm-openvpn-service-defines.h" to "nm-service-defines.h"
    
    For nm-vpnc (and in the future other VPN plugins), we have a similar
    file that serves the same purpose.
    
    Instead of naming them different for each VPN plugin, give them all the
    same name (which makes it more obvious how they relate, and it's more
    convenient when looking at a diff between plugins).

 shared/Makefile.am                                 |    2 +-
 shared/nm-default.h                                |    2 +-
 ...nvpn-service-defines.h => nm-service-defines.h} |    9 ++++-----
 src/Makefile.am                                    |    4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/shared/Makefile.am b/shared/Makefile.am
index d6b0f95..273e656 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -10,7 +10,7 @@ shared_sources = \
     nm-shared-utils.h \
     utils.c \
     utils.h \
-    nm-openvpn-service-defines.h
+    nm-service-defines.h
 
 ###############################################################################
 
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 18dec0f..c9eabb9 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -46,7 +46,7 @@
 #include "nm-version.h"
 #include "gsystem-local-alloc.h"
 #include "nm-macros-internal.h"
-#include "nm-openvpn-service-defines.h"
+#include "nm-service-defines.h"
 
 /*****************************************************************************/
 
diff --git a/shared/nm-openvpn-service-defines.h b/shared/nm-service-defines.h
similarity index 95%
rename from shared/nm-openvpn-service-defines.h
rename to shared/nm-service-defines.h
index 825e3c7..21f25b5 100644
--- a/shared/nm-openvpn-service-defines.h
+++ b/shared/nm-service-defines.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* nm-openvpn-service - openvpn integration with NetworkManager
- *
+/*
  * Copyright (C) 2005 - 2008 Tim Niemueller <tim niemueller de>
  * Copyright (C) 2005 - 2008 Dan Williams <dcbw redhat com>
  *
@@ -20,8 +19,8 @@
  *
  */
 
-#ifndef NM_OPENVPN_SERVICE_DEFINES_H
-#define NM_OPENVPN_SERVICE_DEFINES_H
+#ifndef __NM_SERVICE_DEFINES_H__
+#define __NM_SERVICE_DEFINES_H__
 
 #define NM_VPN_SERVICE_TYPE_OPENVPN "org.freedesktop.NetworkManager.openvpn"
 
@@ -106,4 +105,4 @@
 #define NM_OPENVPN_GROUP  "nm-openvpn"
 #define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot"
 
-#endif /* NM_OPENVPN_SERVICE_DEFINES_H */
+#endif /* __NM_SERVICE_DEFINES_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b8b7a5..1014392 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,11 +17,11 @@ libexec_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
 nm_openvpn_service_SOURCES = \
        nm-openvpn-service.c \
        nm-openvpn-service.h \
-       $(top_srcdir)/shared/nm-openvpn-service-defines.h
+       $(top_srcdir)/shared/nm-service-defines.h
 
 nm_openvpn_service_LDADD = \
        $(LIBNM_LIBS) \
-        $(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
+       $(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
 
 nm_openvpn_service_openvpn_helper_SOURCES = \
        nm-openvpn-service-openvpn-helper.c