From c43847fe14e6b32cc58b8e8168f78e72ef94316d Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 28 Jul 2014 16:20:04 +0800 Subject: autotools: Use non-recursive make With the current testing infrastructure, we don't have a strictly hierarchical set of dependencies. This causes problems with a recursive make, and means we have to hack around some of the dependencies. This change generates a single, top-level makefile from all of the Makefile.am fragments. We still need the po/ directory as a separate SUBDIR, but all others can be converted to non-recursive. Signed-off-by: Jeremy Kerr --- test/Makefile.am | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index 6562836..427041b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -17,10 +17,8 @@ AM_LOG_FLAGS = --leak-check=full --error-exitcode=1 export LOG_COMPILER AM_LOG_FLAGS endif -SUBDIRS = lib parser urls +noinst_SCRIPTS = test/hotplug-device.sh +EXTRA_DIST += $(noinst_SCRIPTS) -noinst_SCRIPTS = hotplug-device.sh - -EXTRA_DIST = $(noinst_SCRIPTS) - -MAINTAINERCLEANFILES = Makefile.in +$(check_PROGRAMS): AM_CFLAGS = -O0 -g -Wall -Wextra -Werror +$(check_PROGRAMS): AM_CPPFLAGS = -DDEBUG -I$(top_srcdir)/lib -- cgit v1.2.1