summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-04-07 11:20:18 -0400
committerDan Winship <danw@gnome.org>2014-04-07 11:30:18 -0400
commit1d0b50c2c4d3bf4a77865afb4533425a11c172d1 (patch)
tree552c8a6a4ca6f26e238cd99369ff321b02be8135
parentb703b14a6aa5f6460d8d38562a2201ce65dce618 (diff)
build: add some missing -DNM_VERSION_MAX_ALLOWED
Add -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE to a bunch of Makefile.ams that were missing it and might eventually need it.
-rw-r--r--callouts/tests/Makefile.am1
-rw-r--r--libnm-glib/tests/Makefile.am1
-rw-r--r--src/config/tests/Makefile.am1
-rw-r--r--src/devices/adsl/Makefile.am1
-rw-r--r--src/devices/bluetooth/Makefile.am1
-rw-r--r--src/devices/wimax/Makefile.am1
-rw-r--r--src/devices/wwan/Makefile.am1
-rw-r--r--src/dhcp-manager/Makefile.am5
-rw-r--r--src/dhcp-manager/tests/Makefile.am1
-rw-r--r--src/dnsmasq-manager/tests/Makefile.am1
-rw-r--r--src/ppp-manager/Makefile.am1
-rw-r--r--src/rdisc/tests/Makefile.am1
-rw-r--r--src/supplicant-manager/tests/Makefile.am1
13 files changed, 16 insertions, 1 deletions
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index 3243d9efef..de4b5f5293 100644
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/callouts \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 5f002cb809..38f449ac1a 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am
index 88601b3a79..2a767ac9ae 100644
--- a/src/config/tests/Makefile.am
+++ b/src/config/tests/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src/config \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
-DSRCDIR=\""$(srcdir)"\"
diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index 589382867a..4c493d943c 100644
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
$(POLKIT_CFLAGS) \
$(LIBNL_CFLAGS) \
diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index e2968dbedd..a82efffbd1 100644
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
$(POLKIT_CFLAGS) \
$(LIBNL_CFLAGS) \
diff --git a/src/devices/wimax/Makefile.am b/src/devices/wimax/Makefile.am
index f6bd1e9e71..2331598879 100644
--- a/src/devices/wimax/Makefile.am
+++ b/src/devices/wimax/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
$(POLKIT_CFLAGS) \
$(IWMX_SDK_CFLAGS) \
diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index 46ae255ea0..5f6358af84 100644
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
$(POLKIT_CFLAGS) \
$(MM_GLIB_CFLAGS)
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 6844140df1..517d38a4dd 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -2,7 +2,10 @@ libexec_PROGRAMS = nm-dhcp-helper
nm_dhcp_helper_SOURCES = nm-dhcp-helper.c
-nm_dhcp_helper_CPPFLAGS = $(DBUS_CFLAGS) -DNMRUNDIR=\"$(nmrundir)\"
+nm_dhcp_helper_CPPFLAGS = \
+ $(DBUS_CFLAGS) \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+ -DNMRUNDIR=\"$(nmrundir)\"
nm_dhcp_helper_LDADD = $(DBUS_LIBS)
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 71d706f429..d84a860e38 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am
index df62a2bffe..5b7e22fbc8 100644
--- a/src/dnsmasq-manager/tests/Makefile.am
+++ b/src/dnsmasq-manager/tests/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/dnsmasq-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 51d5860c8d..1cf50958b5 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -3,6 +3,7 @@ if WITH_PPP
AM_CPPFLAGS = \
-I${top_builddir}/include \
-I${top_srcdir}/include \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS)
diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index 9d21284c70..d7dd828ce2 100644
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/posix-signals \
-I${top_srcdir}/libnm-util \
-I${srcdir}/.. \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(POLKIT_CFLAGS) \
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 8e772b2e3d..742f22478d 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/supplicant-manager \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)