From 39dfc536c719e7041991f6c771ddd40ec3a0c29b Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 14 Nov 2021 15:52:25 +0000 Subject: build: group `*_la_*` variables with their libraries Move the `_SOURCES`, `_LIBADD` and `_LDFLAGS` variables for each input-packet library alongside the matching `.la` definition. In particular, move the `NFLOG` and `ULOG` variables inside the conditionals controlling whether the libraries get built. Signed-off-by: Jeremy Sowden Signed-off-by: Pablo Neira Ayuso --- input/packet/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am index daf374a..5c95e05 100644 --- a/input/packet/Makefile.am +++ b/input/packet/Makefile.am @@ -4,20 +4,20 @@ AM_CPPFLAGS += ${LIBNETFILTER_LOG_CFLAGS} pkglib_LTLIBRARIES = ulogd_inppkt_UNIXSOCK.la +ulogd_inppkt_UNIXSOCK_la_SOURCES = ulogd_inppkt_UNIXSOCK.c +ulogd_inppkt_UNIXSOCK_la_LDFLAGS = -avoid-version -module + if BUILD_ULOG pkglib_LTLIBRARIES += ulogd_inppkt_ULOG.la + +ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c +ulogd_inppkt_ULOG_la_LDFLAGS = -avoid-version -module +ulogd_inppkt_ULOG_la_LIBADD = ../../libipulog/libipulog.la endif if BUILD_NFLOG pkglib_LTLIBRARIES += ulogd_inppkt_NFLOG.la -endif ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c ulogd_inppkt_NFLOG_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_LOG_LIBS) - -ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c -ulogd_inppkt_ULOG_la_LDFLAGS = -avoid-version -module -ulogd_inppkt_ULOG_la_LIBADD = ../../libipulog/libipulog.la - -ulogd_inppkt_UNIXSOCK_la_SOURCES = ulogd_inppkt_UNIXSOCK.c -ulogd_inppkt_UNIXSOCK_la_LDFLAGS = -avoid-version -module +endif -- cgit v1.2.3