[network-manager-openvpn] trivial: rename NETWORK_MANAGER_* build flags to just NM_*

[Dan Williams <dcbw src gnome org>]

commit 4b0ba0aca62830cb9436bbd2b6d6a1af7740e0a2
Author: Dan Williams <dcbw redhat com>
Date:   Fri Feb 18 15:27:25 2011 -0600

    trivial: rename NETWORK_MANAGER_* build flags to just NM_*

 auth-dialog/Makefile.am      |    4 ++--
 common-gnome/Makefile.am     |    4 ++--
 common/Makefile.am           |    4 ++--
 configure.ac                 |    6 +++---
 properties/Makefile.am       |    4 ++--
 properties/tests/Makefile.am |    4 ++--
 src/Makefile.am              |    6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 609c963..d178441 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -3,7 +3,7 @@ libexec_PROGRAMS = nm-openvpn-auth-dialog
 nm_openvpn_auth_dialog_CPPFLAGS =			\
 	$(GTHREAD_CFLAGS)			\
 	$(GTK_CFLAGS)				\
-	$(NETWORK_MANAGER_CFLAGS)		\
+	$(NM_CFLAGS)		\
 	$(GNOMEKEYRING_CFLAGS) \
 	-I$(top_srcdir)/
 	-DICONDIR=\""$(datadir)/pixmaps"\"	\
@@ -22,7 +22,7 @@ nm_openvpn_auth_dialog_SOURCES = \
 
 nm_openvpn_auth_dialog_LDADD = \
 	$(GTK_LIBS) \
-	$(NETWORK_MANAGER_LIBS) \
+	$(NM_LIBS) \
 	$(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la \
 	$(top_builddir)/common/libnm-openvpn-common.la
 
diff --git a/common-gnome/Makefile.am b/common-gnome/Makefile.am
index 4515473..5ade9d2 100644
--- a/common-gnome/Makefile.am
+++ b/common-gnome/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES=libnm-openvpn-common-gnome.la
 
 libnm_openvpn_common_gnome_la_CPPFLAGS = \
-	$(NETWORK_MANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
 	-DG_DISABLE_DEPRECATED
 
@@ -10,6 +10,6 @@ libnm_openvpn_common_gnome_la_SOURCES= \
 	keyring-helpers.h
 
 libnm_openvpn_common_gnome_la_LIBADD = \
-	$(NETWORK_MANAGER_LIBS) \
+	$(NM_LIBS) \
 	$(GNOMEKEYRING_LIBS)
 
diff --git a/common/Makefile.am b/common/Makefile.am
index 743571d..729ffa4 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES=libnm-openvpn-common.la
 
 libnm_openvpn_common_la_CPPFLAGS = \
-	$(NETWORK_MANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
         -I$(top_srcdir)/src/
 
@@ -10,5 +10,5 @@ libnm_openvpn_common_la_SOURCES= \
 	utils.h
 
 libnm_openvpn_common_la_LIBADD = \
-	$(NETWORK_MANAGER_LIBS)
+	$(NM_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 7df441e..073b711 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,13 +65,13 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-PKG_CHECK_MODULES(NETWORK_MANAGER,
+PKG_CHECK_MODULES(NM,
 	NetworkManager >= 0.8.992
 	libnm-util >= 0.8.992
 	libnm-glib >= 0.8.992
 	libnm-glib-vpn >= 0.8.992)
-AC_SUBST(NETWORK_MANAGER_CFLAGS)
-AC_SUBST(NETWORK_MANAGER_LIBS)
+AC_SUBST(NM_CFLAGS)
+AC_SUBST(NM_LIBS)
 
 if test x"$with_gnome" != xno; then
 	AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 4099b8c..fdb50a3 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -16,7 +16,7 @@ ui_DATA = nm-openvpn-dialog.ui
 
 libnm_openvpn_properties_la_CFLAGS =                    \
         $(GTK_CFLAGS)                                   \
-        $(NETWORK_MANAGER_CFLAGS)                       \
+        $(NM_CFLAGS)                       \
         $(GNOMEKEYRING_CFLAGS)                          \
         $(DISABLE_DEPRECATED)                           \
         -I$(top_srcdir)/                                \
@@ -30,7 +30,7 @@ libnm_openvpn_properties_la_CFLAGS =                    \
 
 libnm_openvpn_properties_la_LIBADD =    \
         $(GTK_LIBS)                     \
-        $(NETWORK_MANAGER_LIBS)         \
+        $(NM_LIBS)         \
         $(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la \
         $(top_builddir)/common/libnm-openvpn-common.la
 
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 15ad86c..662b748 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -11,7 +11,7 @@ test_import_export_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
-	$(NETWORK_MANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 test_import_export_LDADD = \
@@ -19,7 +19,7 @@ test_import_export_LDADD = \
 	$(GTK_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
 	$(DBUS_LIBS) \
-	$(NETWORK_MANAGER_LIBS) \
+	$(NM_LIBS) \
 	$(top_builddir)/properties/libnm-openvpn-properties.la
 
 if WITH_TESTS
diff --git a/src/Makefile.am b/src/Makefile.am
index 9557f6b..3f21d36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
-	$(NETWORK_MANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
 	-DPREFIX=\""$(prefix)"\" \
@@ -19,7 +19,7 @@ nm_openvpn_service_SOURCES = \
 	nm-openvpn-service.h
 
 nm_openvpn_service_LDADD = \
-	$(NETWORK_MANAGER_LIBS) \
+	$(NM_LIBS) \
         $(top_builddir)/common/libnm-openvpn-common.la
 
 nm_openvpn_service_openvpn_helper_SOURCES = \
@@ -27,6 +27,6 @@ nm_openvpn_service_openvpn_helper_SOURCES = \
 
 nm_openvpn_service_openvpn_helper_LDADD = \
 	$(DBUS_LIBS) \
-	$(NETWORK_MANAGER_LIBS)
+	$(NM_LIBS)
 
 CLEANFILES = *~