build: add some missing -DNM_VERSION_MAX_ALLOWED

System Internals / NetworkManager - Dan Winship [gnome.org] - 7 April 2014 10:30 EDT

Add -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE to a bunch of Makefile.ams that were missing it and might eventually need it.

###

diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index 3243d9e..de4b5f5 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 5f002cb..38f449a 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 88601b3..2a767ac 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 5893828..4c493d9 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 e2968db..a82efff 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 f6bd1e9..2331598 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 46ae255..5f6358a 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 6844140..517d38a 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 71d706f..d84a860 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 df62a2b..5b7e22f 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 51d5860..1cf5095 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 9d21284..d7dd828 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 8e772b2..742f224 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)

1d0b50c build: add some missing -DNM_VERSION_MAX_ALLOWED
callouts/tests/Makefile.am | 1 +
libnm-glib/tests/Makefile.am | 1 +
src/config/tests/Makefile.am | 1 +
src/devices/adsl/Makefile.am | 1 +
src/devices/bluetooth/Makefile.am | 1 +
src/devices/wimax/Makefile.am | 1 +
src/devices/wwan/Makefile.am | 1 +
src/dhcp-manager/Makefile.am | 5 ++++-
src/dhcp-manager/tests/Makefile.am | 1 +
src/dnsmasq-manager/tests/Makefile.am | 1 +
src/ppp-manager/Makefile.am | 1 +
src/rdisc/tests/Makefile.am | 1 +
src/supplicant-manager/tests/Makefile.am | 1 +
13 files changed, 16 insertions(+), 1 deletion(-)

Upstream: cgit.freedesktop.org


  • Share