From 7994d971798b957fd3dd686f48c71c8725bf703e Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 14 Nov 2021 15:52:24 +0000 Subject: build: skip sub-directories containing disabled plugins Currently, make enters all sub-directories containing source-code, even if they only contain optional targets which are not configured to be built. Instead, change the Makefiles so that the sub-directories are optional, rather than the targets. Group sub-directory definitions consistently at the top of the Makefiles that contain them. Trim a few leading and trailing blank lines. Signed-off-by: Jeremy Sowden Signed-off-by: Pablo Neira Ayuso --- Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7ea5db5..bf390a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,11 @@ +SUBDIRS = include libipulog src input filter output -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 dist_man_MANS = ulogd.8 EXTRA_DIST = ulogd.conf.in doc -SUBDIRS = include libipulog src input filter output - noinst_DATA = ulogd.conf edit = sed \ @@ -17,4 +16,3 @@ ulogd.conf: Makefile $(srcdir)/ulogd.conf.in dist-hook: rm -f ulogd.conf - -- cgit v1.2.3