From 03e88d92a681e73e2ceba92d9ae40614387cd235 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 20 Oct 2016 14:35:18 +0200
Subject: [PATCH] build: move nm.mk into main Makefile.am

---
 Makefile.am | 13 ++++++++++++-
 nm.mk       | 11 -----------
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 nm.mk

diff --git a/Makefile.am b/Makefile.am
index e7178e159e..a28a47a1a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 include $(GLIB_MAKEFILE)
 -include $(INTROSPECTION_MAKEFILE)
-include nm.mk
 
 @GNOME_CODE_COVERAGE_RULES@
 
@@ -83,6 +82,18 @@ SUBDIRS = \
 
 ###############################################################################
 
+set_sanitizer_env = \
+	[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
+	if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \
+		export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
+	fi
+
+check_so_symbols = \
+	$(call set_sanitizer_env,$(1)); \
+	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null
+
+###############################################################################
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-tests=yes \
 	--with-valgrind=no \
diff --git a/nm.mk b/nm.mk
deleted file mode 100644
index 23f5a647cc..0000000000
--- a/nm.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# NetworkManager Makefile helpers
-
-set_sanitizer_env = \
-	[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
-	if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \
-		export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
-	fi
-
-check_so_symbols = \
-	$(call set_sanitizer_env,$(1)); \
-	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null