History

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
  1. examples/Makefile.am +1 −1
  2. src/Makefile.am +2 −2
  3. tests/Makefile.am +1 −1
examples/Makefile.am+1−1
@@ -6,7 +6,7 @@ bin_PROGRAMS = sndfile-resample · 5 unmodified lines
66 check_PROGRAMS = varispeed-play timewarp-file
77
88 SAMPLERATEDIR =../src
9−INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
9+AM_CPPFLAGS = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
1010
1111 OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
1212
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
3131 @echo
3232 @echo
3333
34−%.s : $(srcdir)/%.c
35− $(CC) -S $(CFLAGS) $(DEFAULT_INCLUDES) $(srcdir)/$+ -o $@
34+.c.s:
35+ $(CC) -S $(CFLAGS) $(CPPFLAGS) $(DEFAULT_INCLUDES) $< -o $@
3636
3737 # Disable autoheader.
3838 AUTOHEADER=echo
tests/Makefile.am+1−1
@@ -18,7 +18,7 @@ TESTS = \ · 17 unmodified lines
1818 throughput_test
1919
2020 SAMPLRATEDIR =../src
21−INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)
21+AM_CPPFLAGS = -I$(srcdir)/$(SAMPLRATEDIR)
2222 noinst_HEADERS = util.h
2323
2424 #===============================================================================

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t