[network-manager-openconnect] trivial: shorten NM build flags variable name
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect] trivial: shorten NM build flags variable name
- Date: Thu, 10 Nov 2011 05:58:20 +0000 (UTC)
commit 7bf8fa8ea0d954c96312dd58b867ad5aa381da34
Author: Dan Williams <dcbw redhat com>
Date: Wed Nov 9 23:57:57 2011 -0600
trivial: shorten NM build flags variable name
auth-dialog/Makefile.am | 4 ++--
configure.ac | 6 +++---
properties/Makefile.am | 4 ++--
src/Makefile.am | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 032cee0..6d98a26 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
libexec_PROGRAMS = nm-openconnect-auth-dialog
nm_openconnect_auth_dialog_CPPFLAGS = \
- $(NETWORKMANAGER_CFLAGS) \
+ $(NM_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
@@ -23,7 +23,7 @@ nm_openconnect_auth_dialog_SOURCES = \
nm_openconnect_auth_dialog_LDADD = \
$(GTK_LIBS) \
- $(NETWORKMANAGER_LIBS) \
+ $(NM_LIBS) \
$(GCONF_LIBS) \
$(OPENCONNECT_LIBS) \
$(LIBXML_LIBS)
diff --git a/configure.ac b/configure.ac
index 7802073..f064c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,13 +95,13 @@ if test x"$with_gnome" != xno; then
fi
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 c3dea82..c21bf91 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -13,7 +13,7 @@ ui_DATA = nm-openconnect-dialog.ui
libnm_openconnect_properties_la_CFLAGS = \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
- $(NETWORKMANAGER_CFLAGS) \
+ $(NM_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DG_DISABLE_DEPRECATED \
@@ -25,7 +25,7 @@ libnm_openconnect_properties_la_CFLAGS = \
libnm_openconnect_properties_la_LIBADD = \
$(GTK_LIBS) \
$(GCONF_LIBS) \
- $(NETWORKMANAGER_LIBS)
+ $(NM_LIBS)
libnm_openconnect_properties_la_LDFLAGS = \
-avoid-version
diff --git a/src/Makefile.am b/src/Makefile.am
index 127761d..e95b77d 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)"\" \
@@ -26,7 +26,7 @@ nm_openconnect_service_SOURCES = \
nm_openconnect_service_LDADD = \
$(DBUS_LIBS) \
$(GTHREAD_LIBS) \
- $(NETWORKMANAGER_LIBS)
+ $(NM_LIBS)
nm_openconnect_service_openconnect_helper_SOURCES = \
@@ -35,6 +35,6 @@ nm_openconnect_service_openconnect_helper_SOURCES = \
nm_openconnect_service_openconnect_helper_LDADD = \
$(DBUS_LIBS) \
$(GTHREAD_LIBS) \
- $(NETWORKMANAGER_LIBS)
+ $(NM_LIBS)
CLEANFILES = *~
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]