build: move nm.mk into main Makefile.am

This commit is contained in:
Thomas Haller 2016-10-20 14:35:18 +02:00
parent 2296db22c8
commit 03e88d92a6
2 changed files with 12 additions and 12 deletions

View File

@ -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 \

11
nm.mk
View File

@ -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