[network-manager-vpnc] trivial: shorten NM build flags variable name

[Dan Williams <dcbw src gnome org>]

commit 7eed390c83e1063a040898ecc8f832818d6412ed
Author: Dan Williams <dcbw redhat com>
Date:   Wed Nov 9 23:58:18 2011 -0600

    trivial: shorten NM build flags variable name

 auth-dialog/Makefile.am      |    4 ++--
 configure.ac                 |    6 +++---
 properties/Makefile.am       |    4 ++--
 properties/tests/Makefile.am |    4 ++--
 src/Makefile.am              |    6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index d761f7b..896da14 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 libexec_PROGRAMS = nm-vpnc-auth-dialog
 
 nm_vpnc_auth_dialog_CPPFLAGS = \
-	$(NETWORKMANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
@@ -21,7 +21,7 @@ nm_vpnc_auth_dialog_SOURCES = \
 
 nm_vpnc_auth_dialog_LDADD = \
 	$(GTK_LIBS) \
-	$(NETWORKMANAGER_LIBS) \
+	$(NM_LIBS) \
 	$(GNOMEKEYRING_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/configure.ac b/configure.ac
index 41f4386..0e612f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,13 +90,13 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GNOMEKEYRING_LIBS)
 fi
 
-PKG_CHECK_MODULES(NETWORKMANAGER,
+PKG_CHECK_MODULES(NM,
                   NetworkManager >= 0.9.3
                   libnm-util >= 0.9.3
                   libnm-glib >= 0.9.3
                   libnm-glib-vpn >= 0.9.3)
-AC_SUBST(NETWORKMANAGER_CFLAGS)
-AC_SUBST(NETWORKMANAGER_LIBS)
+AC_SUBST(NM_CFLAGS)
+AC_SUBST(NM_LIBS)
 
 NM_COMPILER_WARNINGS
 
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 4da4aa1..4994efc 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -17,7 +17,7 @@ ui_DATA = nm-vpnc-dialog.ui
 libnm_vpnc_properties_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
-	$(NETWORKMANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	-DICONDIR=\""$(datadir)/pixmaps"\" \
 	-DUIDIR=\""$(uidir)"\" \
 	-DG_DISABLE_DEPRECATED \
@@ -27,7 +27,7 @@ libnm_vpnc_properties_la_CPPFLAGS = \
 
 libnm_vpnc_properties_la_LIBADD = \
 	$(GTK_LIBS) \
-	$(NETWORKMANAGER_LIBS) \
+	$(NM_LIBS) \
 	$(GNOMEKEYRING_LIBS)
 
 libnm_vpnc_properties_la_LDFLAGS = \
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 78b749d..fc1a6dd 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) \
-	$(NETWORKMANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 test_import_export_LDADD = \
@@ -19,7 +19,7 @@ test_import_export_LDADD = \
 	$(GTK_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
 	$(DBUS_LIBS) \
-	$(NETWORKMANAGER_LIBS) \
+	$(NM_LIBS) \
 	$(top_builddir)/properties/libnm-vpnc-properties.la
 
 if WITH_TESTS
diff --git a/src/Makefile.am b/src/Makefile.am
index fe408da..6c0ca5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
-	$(NETWORKMANAGER_CFLAGS) \
+	$(NM_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
 	-DPREFIX=\""$(prefix)"\" \
@@ -24,7 +24,7 @@ nm_vpnc_service_SOURCES = \
 nm_vpnc_service_LDADD = \
 	$(DBUS_LIBS) \
 	$(GTHREAD_LIBS) \
-	$(NETWORKMANAGER_LIBS)
+	$(NM_LIBS)
 
 
 nm_vpnc_service_vpnc_helper_SOURCES = \
@@ -33,6 +33,6 @@ nm_vpnc_service_vpnc_helper_SOURCES = \
 nm_vpnc_service_vpnc_helper_LDADD = \
 	$(DBUS_LIBS) \
 	$(GTHREAD_LIBS) \
-	$(NETWORKMANAGER_LIBS)
+	$(NM_LIBS)
 
 CLEANFILES = *~