From 9ef17869b5fa775bd7f1da14471f52775efe1017 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 16 Jan 2018 15:42:43 +0100
Subject: [PATCH] version: drop NM_VERSION_MAX_ALLOWED defines for internal
 build

It already defaults to the right value. We only need to define
NM_VERSION_MIN_REQUIRED, so that parts of our internal build
can make use of deprecated API.
---
 Makefile.examples           | 3 +--
 docs/libnm-glib/Makefile.am | 1 -
 docs/libnm-util/Makefile.am | 1 -
 docs/libnm/Makefile.am      | 1 -
 examples/C/glib/meson.build | 1 -
 shared/nm-default.h         | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile.examples b/Makefile.examples
index efbbe289f5..d49db6ce86 100644
--- a/Makefile.examples
+++ b/Makefile.examples
@@ -9,8 +9,7 @@ examples_C_glib_cppflags = \
 	-I$(top_builddir)/libnm-core \
 	-I$(top_srcdir)/libnm \
 	-I$(top_builddir)/libnm \
-	$(GLIB_CFLAGS) \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE
+	$(GLIB_CFLAGS)
 
 examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
 examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags)
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index e733f76502..8a868d0e9c 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -56,7 +56,6 @@ GTKDOC_CFLAGS =				\
 	-I$(top_builddir)/libnm-util	\
 	-I$(top_srcdir)/libnm-glib	\
 	-I$(top_builddir)/libnm-glib	\
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index eb16d7601e..1d417894b2 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -50,7 +50,6 @@ extra_files =
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =				\
 	-I$(top_srcdir)/libnm-util	\
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
 	$(GLIB_CFLAGS)			\
 	$(DBUS_CFLAGS)
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index 362a434455..288a595e64 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -71,7 +71,6 @@ GTKDOC_CFLAGS =				\
 	-I$(top_builddir)/libnm-core	\
 	-I$(top_srcdir)/libnm		\
 	-I$(top_builddir)/libnm		\
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
 	$(GLIB_CFLAGS)
 
diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build
index acc1e71237..edc4dbb142 100644
--- a/examples/C/glib/meson.build
+++ b/examples/C/glib/meson.build
@@ -15,6 +15,5 @@ foreach example: examples
     [example[0] + '.c'] + example[1],
     include_directories: example[2],
     dependencies: [nm_core_dep] + example[3],
-    c_args: '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE'
   )
 endforeach
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 0ddad504ce..8dab263be0 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -115,7 +115,6 @@
 /* for internal compilation we don't want the deprecation macros
  * to be in effect. Define the widest range of versions to effectively
  * disable deprecation checks */
-#define NM_VERSION_MAX_ALLOWED   NM_VERSION_CUR_STABLE
 #define NM_VERSION_MIN_REQUIRED  NM_VERSION_0_9_8
 
 #ifndef NM_MORE_ASSERTS