Automake recommends the use of $(CFLAGS), not @CFLAGS@, because
that allows a user to override CFLAGS at make time (with
'make CFLAGS=-g', for example) rather than being hard-coded to
the CFLAGS in use during configure time. Use the preferred
substitution style for ALL variables, not just CFLAGS.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
Applies to the master branch (although I discovered it while
debugging the extensions-write-zeroes branch).
Makefile.am | 22 +++++++++++-----------
tests/code/Makefile.am | 12 ++++++------
tests/run/Makefile.am | 8 ++++----
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6660826..7faf4f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,30 @@
ACLOCAL_AMFLAGS = -I support
SUBDIRS = . man doc tests systemd gznbd
bin_PROGRAMS = nbd-server nbd-trdump
-sbin_PROGRAMS = @NBD_CLIENT_NAME@
+sbin_PROGRAMS = $(NBD_CLIENT_NAME)
EXTRA_PROGRAMS = nbd-client make-integrityhuge
noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la
libcliserv_la_SOURCES = cliserv.h cliserv.c
-libcliserv_la_CFLAGS = @CFLAGS@
+libcliserv_la_CFLAGS = $(CFLAGS)
nbd_client_SOURCES = nbd-client.c cliserv.h
nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd.h nbdsrv.h backend.h \
netdb-compat.h
nbd_trdump_SOURCES = nbd-trdump.c cliserv.h nbd.h
-nbd_client_CFLAGS = @CFLAGS@
-nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
-nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+nbd_client_CFLAGS = $(CFLAGS)
+nbd_server_CFLAGS = $(CFLAGS) $(GLIB_CFLAGS)
+nbd_trdump_CFLAGS = $(CFLAGS) $(GLIB_CFLAGS)
libnbdsrv_la_SOURCES = nbdsrv.c nbdsrv.h treefiles.c treefiles.h
-libnbdsrv_la_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+libnbdsrv_la_CFLAGS = $(CFLAGS) $(GLIB_CFLAGS)
nbd_client_LDADD = libcliserv.la
-nbd_server_LDADD = @GLIB_LIBS@ libnbdsrv.la libcliserv.la
+nbd_server_LDADD = $(GLIB_LIBS) libnbdsrv.la libcliserv.la
nbd_trdump_LDADD = libcliserv.la
make_integrityhuge_SOURCES = make-integrityhuge.c cliserv.h nbd.h nbd-debug.h
EXTRA_DIST = maketr CodingStyle autogen.sh README.md support/genver.sh
if GNUTLS
nbd_client_SOURCES += crypto-gnutls.c crypto-gnutls.h buffer.c buffer.h
-nbd_client_CFLAGS += @GnuTLS_CFLAGS@
-nbd_client_LDADD += @GnuTLS_LIBS@
+nbd_client_CFLAGS += $(GnuTLS_CFLAGS)
+nbd_client_LDADD += $(GnuTLS_LIBS)
-nbd_server_CFLAGS += @GnuTLS_CFLAGS@
-nbd_server_LDADD += @GnuTLS_LIBS@
+nbd_server_CFLAGS += $(GnuTLS_CFLAGS)
+nbd_server_LDADD += $(GnuTLS_LIBS)
endif
diff --git a/tests/code/Makefile.am b/tests/code/Makefile.am
index de3376b..c3ef356 100644
--- a/tests/code/Makefile.am
+++ b/tests/code/Makefile.am
@@ -2,20 +2,20 @@ TESTS = clientacl dup mask size trim
check_PROGRAMS = clientacl dup mask size trim
EXTRA_DIST = macro.h
-AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = $(CFLAGS) $(GLIB_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)
clientacl_SOURCES = clientacl.c punchdummy.c
-clientacl_LDADD = $(top_builddir)/libnbdsrv.la @GLIB_LIBS@
+clientacl_LDADD = $(top_builddir)/libnbdsrv.la $(GLIB_LIBS)
dup_SOURCES = dup.c punchdummy.c
-dup_LDADD = $(top_builddir)/libnbdsrv.la @GLIB_LIBS@
+dup_LDADD = $(top_builddir)/libnbdsrv.la $(GLIB_LIBS)
mask_SOURCES = mask.c punchdummy.c
-mask_LDADD = $(top_builddir)/libnbdsrv.la @GLIB_LIBS@
+mask_LDADD = $(top_builddir)/libnbdsrv.la $(GLIB_LIBS)
size_SOURCES = size.c punchdummy.c
-size_LDADD = $(top_builddir)/libnbdsrv.la @GLIB_LIBS@
+size_LDADD = $(top_builddir)/libnbdsrv.la $(GLIB_LIBS)
trim_SOURCES = trim.c
-trim_LDADD = $(top_builddir)/libnbdsrv.la @GLIB_LIBS@
+trim_LDADD = $(top_builddir)/libnbdsrv.la $(GLIB_LIBS)
diff --git a/tests/run/Makefile.am b/tests/run/Makefile.am
index c63732b..2764223 100644
--- a/tests/run/Makefile.am
+++ b/tests/run/Makefile.am
@@ -20,13 +20,13 @@ crypto-gnutls.c:
rm -f crypto-gnutls.c
ln -s $(top_srcdir)/crypto-gnutls.c crypto-gnutls.c
nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.c
-nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+nbd_tester_client_CFLAGS = $(CFLAGS) $(GLIB_CFLAGS)
nbd_tester_client_CPPFLAGS = -I$(top_srcdir)
-nbd_tester_client_LDADD = @GLIB_LIBS@
+nbd_tester_client_LDADD = $(GLIB_LIBS)
if GNUTLS
nbd_tester_client_SOURCES += buffer.c crypto-gnutls.c
-nbd_tester_client_CFLAGS += @GnuTLS_CFLAGS@
-nbd_tester_client_LDADD += @GnuTLS_LIBS@
+nbd_tester_client_CFLAGS += $(GnuTLS_CFLAGS)
+nbd_tester_client_LDADD += $(GnuTLS_LIBS)
endif
EXTRA_DIST = integrity-test.tr integrityhuge-test.tr simple_test
certs/client-key.pem certs/client-cert.pem certs/server-cert.pem
certs/ca-cert.pem certs/ca.info certs/client.info certs/server-key.pem
certs/ca-key.pem certs/server.info certs/README.md
cfg1:
--
2.9.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Nbd-general mailing list
Nbd-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nbd-general
