Use $(...) instead of @...@ for precious variables

* AC_SUBST creates the variable assignment transparently: var = @var@ hence there is no need to directly include @var@-style replacements, which cannot be overridden when running Make.

David Seifert committed 9 years ago

Commit a172af31 parent 3224a2a3 files · +13 −17Browse files

Unified · Split

3 files

examples/Makefile.am +5 −9
src/Makefile.am +1 −1
tests/Makefile.am +7 −7

examples/Makefile.am+5−9

@@ -8,23 +8,19 @@ endif · 7 unmodified lines
8	check_PROGRAMS = varispeed-play timewarp-file	8	check_PROGRAMS = varispeed-play timewarp-file
9		9
10	SAMPLERATEDIR =../src	10	SAMPLERATEDIR =../src
11	AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@	11	AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) $(OS_SPECIFIC_INCLUDES)
12		12	AM_CFLAGS = $(SNDFILE_CFLAGS)
13	OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
14
15	SNDFILE_LIBS = @SNDFILE_LIBS@ @ALSA_LIBS@
16	AM_CFLAGS = @SNDFILE_CFLAGS@
17		13
18	#===============================================================================	14	#===============================================================================
19		15
20	if HAVE_LIBSNDFILE	16	if HAVE_LIBSNDFILE
21	sndfile_resample_SOURCES = sndfile-resample.c	17	sndfile_resample_SOURCES = sndfile-resample.c
22	sndfile_resample_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS)	18	sndfile_resample_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(ALSA_LIBS)
23	endif	19	endif
24		20
25	varispeed_play_SOURCES = varispeed-play.c audio_out.c audio_out.h	21	varispeed_play_SOURCES = varispeed-play.c audio_out.c audio_out.h
26	varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS)	22	varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(ALSA_LIBS) $(OS_SPECIFIC_LINKS)
27		23
28	timewarp_file_SOURCES = timewarp-file.c	24	timewarp_file_SOURCES = timewarp-file.c
29	timewarp_file_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS)	25	timewarp_file_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(ALSA_LIBS)
30		26

src/Makefile.am+1−1

@@ -15,7 +15,7 @@ noinst_HEADERS = common.h float_cast.h $(COEFF_HDRS) · 14 unmodified lines
15	SRC_SOURCES = samplerate.c src_sinc.c $(COEFF_HDRS) src_zoh.c src_linear.c	15	SRC_SOURCES = samplerate.c src_sinc.c $(COEFF_HDRS) src_zoh.c src_linear.c
16		16
17	# MinGW requires -no-undefined if a DLL is to be built.	17	# MinGW requires -no-undefined if a DLL is to be built.
18	libsamplerate_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@	18	libsamplerate_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG)
19	libsamplerate_la_SOURCES = $(SRC_SOURCES) $(noinst_HEADERS)	19	libsamplerate_la_SOURCES = $(SRC_SOURCES) $(noinst_HEADERS)
20	libsamplerate_la_LIBADD = -lm	20	libsamplerate_la_LIBADD = -lm
21		21

tests/Makefile.am+7−7

Use $(...) instead of @...@ for precious variables

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -39,15 +39,15 @@ reset_test_SOURCES = reset_test.c util.c util.h · 38 unmodified lines
39	reset_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la	39	reset_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
40		40
41	multi_channel_test_SOURCES = multi_channel_test.c util.c calc_snr.c	41	multi_channel_test_SOURCES = multi_channel_test.c util.c calc_snr.c
42	multi_channel_test_CFLAGS = @FFTW3_CFLAGS@	42	multi_channel_test_CFLAGS = $(FFTW3_CFLAGS)
43	multi_channel_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)	43	multi_channel_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
44		44
45	snr_bw_test_SOURCES = snr_bw_test.c calc_snr.c util.c util.h	45	snr_bw_test_SOURCES = snr_bw_test.c calc_snr.c util.c util.h
46	snr_bw_test_CFLAGS = @FFTW3_CFLAGS@	46	snr_bw_test_CFLAGS = $(FFTW3_CFLAGS)
47	snr_bw_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)	47	snr_bw_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
48		48
49	callback_test_SOURCES = callback_test.c util.c util.h	49	callback_test_SOURCES = callback_test.c util.c util.h
50	callback_test_CFLAGS = @FFTW3_CFLAGS@	50	callback_test_CFLAGS = $(FFTW3_CFLAGS)
51	callback_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la	51	callback_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
52		52
53	float_short_test_SOURCES = float_short_test.c util.c util.h	53	float_short_test_SOURCES = float_short_test.c util.c util.h
@@ -57,19 +57,19 @@ downsample_test_SOURCES = downsample_test.c util.c util.h · 3 unmodified lines
57	downsample_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la	57	downsample_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
58		58
59	varispeed_test_SOURCES = varispeed_test.c util.c util.h calc_snr.c	59	varispeed_test_SOURCES = varispeed_test.c util.c util.h calc_snr.c
60	varispeed_test_CFLAGS = @FFTW3_CFLAGS@	60	varispeed_test_CFLAGS = $(FFTW3_CFLAGS)
61	varispeed_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)	61	varispeed_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
62		62
63	# This program is for evaluating other sample rate converters.	63	# This program is for evaluating other sample rate converters.
64		64
65	throughput_test_CFLAGS = $(AM_CFLAGS) @FFTW3_CFLAGS@	65	throughput_test_CFLAGS = $(AM_CFLAGS) $(FFTW3_CFLAGS)
66	throughput_test_SOURCES = throughput_test.c util.c calc_snr.c	66	throughput_test_SOURCES = throughput_test.c util.c calc_snr.c
67	throughput_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)	67	throughput_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
68		68
69	multichan_throughput_test_CFLAGS = $(AM_CFLAGS) @FFTW3_CFLAGS@	69	multichan_throughput_test_CFLAGS = $(AM_CFLAGS) $(FFTW3_CFLAGS)
70	multichan_throughput_test_SOURCES = multichan_throughput_test.c util.c calc_snr.c	70	multichan_throughput_test_SOURCES = multichan_throughput_test.c util.c calc_snr.c
71	multichan_throughput_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)	71	multichan_throughput_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
72		72
73	src_evaluate_SOURCES = src-evaluate.c calc_snr.c util.c	73	src_evaluate_SOURCES = src-evaluate.c calc_snr.c util.c
74	src_evaluate_CFLAGS = @SNDFILE_CFLAGS@ @FFTW3_CFLAGS@	74	src_evaluate_CFLAGS = $(SNDFILE_CFLAGS) $(FFTW3_CFLAGS)
75	src_evaluate_LDADD = $(SNDFILE_LIBS) $(FFTW3_LIBS)	75	src_evaluate_LDADD = $(SNDFILE_LIBS) $(FFTW3_LIBS)