[network-manager-vpnc/NM_0_8] trivial: clean up build stuff

[Dan Williams <dcbw src gnome org>]

commit 1aa18ef2bbe700470138a04e933152022b22666b
Author: Dan Williams <dcbw redhat com>
Date:   Mon Oct 25 09:13:04 2010 -0500

    trivial: clean up build stuff

 auth-dialog/Makefile.am      |    2 +-
 common-gnome/Makefile.am     |    4 ++--
 configure.ac                 |   10 +++++++---
 properties/Makefile.am       |    4 ++--
 properties/tests/Makefile.am |    4 ++--
 src/Makefile.am              |   18 +++++++++---------
 6 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index f6c8ad8..61bd673 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 = \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GCONF_CFLAGS) \
diff --git a/common-gnome/Makefile.am b/common-gnome/Makefile.am
index fd38f3a..1240ca7 100644
--- a/common-gnome/Makefile.am
+++ b/common-gnome/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES=libnm-vpnc-common-gnome.la
 
 libnm_vpnc_common_gnome_la_CPPFLAGS = \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
 	-DG_DISABLE_DEPRECATED
@@ -11,7 +11,7 @@ libnm_vpnc_common_gnome_la_SOURCES= \
 	keyring-helpers.h
 
 libnm_vpnc_common_gnome_la_LIBADD = \
-	$(NM_UTILS_LIBS) \
+	$(NETWORKMANAGER_LIBS) \
 	$(GLIB_LIBS) \
 	$(GNOMEKEYRING_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 65de175..a3eaad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,9 +87,13 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GNOMEKEYRING_LIBS)
 fi
 
-PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.8.1.997 libnm-util libnm-glib libnm-glib-vpn)
-AC_SUBST(NM_UTILS_CFLAGS)
-AC_SUBST(NM_UTILS_LIBS)
+PKG_CHECK_MODULES(NETWORKMANAGER,
+                  NetworkManager >= 0.8.1.997
+                  libnm-util >= 0.8.1.997
+                  libnm-glib >= 0.8.1.997
+                  libnm-glib-vpn >= 0.8.1.997)
+AC_SUBST(NETWORKMANAGER_CFLAGS)
+AC_SUBST(NETWORKMANAGER_LIBS)
 
 NM_COMPILER_WARNINGS
 
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 4f2e9f5..529b7a8 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -19,7 +19,7 @@ libnm_vpnc_properties_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	-DICONDIR=\""$(datadir)/pixmaps"\" \
 	-DGLADEDIR=\""$(gladedir)"\" \
 	-DG_DISABLE_DEPRECATED \
@@ -32,7 +32,7 @@ libnm_vpnc_properties_la_LIBADD = \
 	$(GLADE_LIBS) \
 	$(GTK_LIBS) \
 	$(GCONF_LIBS) \
-	$(NM_UTILS_LIBS) \
+	$(NETWORKMANAGER_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
 	$(top_builddir)/common-gnome/libnm-vpnc-common-gnome.la
 
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 641b8cd..f4b4d22 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -13,7 +13,7 @@ test_import_export_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 test_import_export_LDADD = \
@@ -23,7 +23,7 @@ test_import_export_LDADD = \
 	$(GCONF_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
 	$(DBUS_LIBS) \
-	$(NM_UTILS_LIBS) \
+	$(NETWORKMANAGER_LIBS) \
 	$(top_builddir)/properties/libnm-vpnc-properties.la
 
 if WITH_TESTS
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ef8b4f..fe408da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
 	-DPREFIX=\""$(prefix)"\" \
@@ -17,22 +17,22 @@ AM_CPPFLAGS = \
 libexec_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
 
 nm_vpnc_service_SOURCES = \
-				nm-vpnc-service.c \
-				nm-vpnc-service.h
+	nm-vpnc-service.c \
+	nm-vpnc-service.h
 
 
 nm_vpnc_service_LDADD = \
-				$(DBUS_LIBS) \
-				$(GTHREAD_LIBS) \
-				$(NM_UTILS_LIBS)
+	$(DBUS_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(NETWORKMANAGER_LIBS)
 
 
 nm_vpnc_service_vpnc_helper_SOURCES = \
 				nm-vpnc-service-vpnc-helper.c
 
 nm_vpnc_service_vpnc_helper_LDADD = \
-				$(DBUS_LIBS) \
-				$(GTHREAD_LIBS) \
-				$(NM_UTILS_LIBS)
+	$(DBUS_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(NETWORKMANAGER_LIBS)
 
 CLEANFILES = *~