From 1de80cc4b7782179dc392ca17bbd309655b905b2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 11 Nov 2019 18:02:49 +0100 Subject: [PATCH] Makefile.am: Use ${} instead of @...@ Referencing to variables using @...@ means they will be replaced by configure. This is not needed and may cause problems later. Suggested-by: Jan Engelhardt Signed-off-by: Phil Sutter Acked-by: Arturo Borrero Gonzalez Acked-by: Pablo Neira Ayuso (cherry picked from commit f09b07f26c2bc15f59e64cc393c003966d7ca217) --- Makefile.am | 2 +- src/Makefile.am | 2 +- src/helpers/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index f64d60438d411..df4c0cbf71664 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = $(man_MANS) Make_global.am doc m4 tests SUBDIRS = extensions src DIST_SUBDIRS = include src extensions -LIBS = @LIBNETFILTER_CONNTRACK_LIBS@ +LIBS = $(LIBNETFILTER_CONNTRACK_LIBS) dist-hook: rm -rf `find $(distdir)/doc -name *.orig` diff --git a/src/Makefile.am b/src/Makefile.am index a9a868596e69c..a5b918d951327 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,7 @@ if HAVE_CTHELPER nfct_LDADD += ${LIBNETFILTER_CTHELPER_LIBS} endif -nfct_LDFLAGS = -export-dynamic @LAZY_LDFLAGS@ +nfct_LDFLAGS = -export-dynamic ${LAZY_LDFLAGS} conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c queue_tx.c rbtree.c \ local.c log.c mcast.c udp.c netlink.c vector.c \ diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am index 51e2841a7646a..d851d313e6fea 100644 --- a/src/helpers/Makefile.am +++ b/src/helpers/Makefile.am @@ -10,7 +10,7 @@ pkglib_LTLIBRARIES = ct_helper_amanda.la \ ct_helper_sane.la \ ct_helper_ssdp.la -HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) @LAZY_LDFLAGS@ +HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) $(LAZY_LDFLAGS) HELPER_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS) ct_helper_amanda_la_SOURCES = amanda.c @@ -31,7 +31,7 @@ ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS) ct_helper_rpc_la_SOURCES = rpc.c ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) -ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) @LIBTIRPC_CFLAGS@ +ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(LIBTIRPC_CFLAGS) ct_helper_tftp_la_SOURCES = tftp.c ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS) -- 2.34.1