diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2021-11-14 15:52:24 +0000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-11-15 11:42:41 +0100 |
| commit | 7994d971798b957fd3dd686f48c71c8725bf703e (patch) | |
| tree | 5f9598aec58508f2b191aaa02d4d118d2c2da8bd /input | |
| parent | 6cc4b5a9968708178989c850177ffd734c2b9eae (diff) | |
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 <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'input')
| -rw-r--r-- | input/Makefile.am | 9 | ||||
| -rw-r--r-- | input/flow/Makefile.am | 2 | ||||
| -rw-r--r-- | input/sum/Makefile.am | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/input/Makefile.am b/input/Makefile.am index 5ffef1b..668fc2b 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,2 +1,9 @@ +if BUILD_NFCT + OPT_SUBDIR_FLOW = flow +endif -SUBDIRS = packet flow sum +if BUILD_NFACCT + OPT_SUBDIR_SUM = sum +endif + +SUBDIRS = packet $(OPT_SUBDIR_FLOW) $(OPT_SUBDIR_SUM) diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am index 004e532..2171a0c 100644 --- a/input/flow/Makefile.am +++ b/input/flow/Makefile.am @@ -2,12 +2,10 @@ include $(top_srcdir)/Make_global.am AM_CPPFLAGS += ${LIBNETFILTER_CONNTRACK_CFLAGS} -if BUILD_NFCT pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) -endif #ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c #ulogd_inpflow_IPFIX_la_LDFLAGS = -avoid-version -module diff --git a/input/sum/Makefile.am b/input/sum/Makefile.am index e0c42f7..b24af7b 100644 --- a/input/sum/Makefile.am +++ b/input/sum/Makefile.am @@ -2,9 +2,8 @@ include $(top_srcdir)/Make_global.am AM_CPPFLAGS += $(LIBNETFILTER_ACCT_CFLAGS) $(LIBMNL_CFLAGS) -if BUILD_NFACCT pkglib_LTLIBRARIES = ulogd_inpflow_NFACCT.la + ulogd_inpflow_NFACCT_la_SOURCES = ulogd_inpflow_NFACCT.c ulogd_inpflow_NFACCT_la_LDFLAGS = -avoid-version -module ulogd_inpflow_NFACCT_la_LIBADD = $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_LIBS) -endif |