Modernise Automake code to be more portable

* Prefer POSIX pattern rules over GNU patterns rules * Use AM_CPPFLAGS and not INCLUDES

David Seifert committed 9 years ago

Commit 3ea3b461 parent 63acb183 files · +4 −4Browse files

Unified · Split

3 files

examples/Makefile.am +1 −1
src/Makefile.am +2 −2
tests/Makefile.am +1 −1

examples/Makefile.am+1−1

@@ -6,7 +6,7 @@ bin_PROGRAMS = sndfile-resample · 5 unmodified lines
6	check_PROGRAMS = varispeed-play timewarp-file	6	check_PROGRAMS = varispeed-play timewarp-file
7		7
8	SAMPLERATEDIR =../src	8	SAMPLERATEDIR =../src
9	INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@	9	AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
10		10
11	OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@	11	OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
12		12

src/Makefile.am+2−2

@@ -31,8 +31,8 @@ check-asm : check_asm.sh src_sinc.s src_linear.s src_zoh.s · 30 unmodified lines
31	@echo	31	@echo
32	@echo	32	@echo
33		33
34	%.s : $(srcdir)/%.c	34	.c.s:
35	$(CC) -S $(CFLAGS) $(DEFAULT_INCLUDES) $(srcdir)/$+ -o $@	35	$(CC) -S $(CFLAGS) $(CPPFLAGS) $(DEFAULT_INCLUDES) $< -o $@
36		36
37	# Disable autoheader.	37	# Disable autoheader.
38	AUTOHEADER=echo	38	AUTOHEADER=echo

tests/Makefile.am+1−1

@@ -18,7 +18,7 @@ TESTS = \ · 17 unmodified lines
18	throughput_test	18	throughput_test
19		19
20	SAMPLRATEDIR =../src	20	SAMPLRATEDIR =../src
21	INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)	21	AM_CPPFLAGS = -I$(srcdir)/$(SAMPLRATEDIR)
22	noinst_HEADERS = util.h	22	noinst_HEADERS = util.h
23		23
24	#===============================================================================	24	#===============================================================================