summaryrefslogtreecommitdiff
path: root/srfi
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-06-28 22:00:44 +0200
committerLudovic Courtès <ludo@gnu.org>2008-06-28 22:15:52 +0200
commit47871d5a161400e87999b7e28a85cb9022610238 (patch)
tree594a4b1685d9f63ae733e00f6d5c73ceccbd78ca /srfi
parentc8779dde04535333f8c2a7258a412420e9778e2f (diff)
downloadguile-47871d5a161400e87999b7e28a85cb9022610238.tar.gz
Modernize Automake files.
Diffstat (limited to 'srfi')
-rw-r--r--srfi/ChangeLog3
-rw-r--r--srfi/Makefile.am8
2 files changed, 7 insertions, 4 deletions
diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index 5c17089af..f35b25e16 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,5 +1,8 @@
2008-06-28 Ludovic Courtès <ludo@gnu.org>
+ * Makefile.am (INCLUDES): Renamed to...
+ (AM_CPPFLAGS): this, to match current Automake conventions.
+
* srfi-19.scm (priv:read-tai-utc-data): Use `eof-object?'
instead of comparing LINE with `eof'.
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 34c6ffb71..64858cd27 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -26,8 +26,8 @@ DEFS = @DEFS@ @EXTRA_DEFS@
## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. Also look for Gnulib headers in `lib'.
-INCLUDES = -I.. -I$(srcdir)/.. \
- -I$(top_srcdir)/lib -I$(top_builddir)/lib
+AM_CPPFLAGS = -I.. -I$(srcdir)/.. \
+ -I$(top_srcdir)/lib -I$(top_builddir)/lib
srfiincludedir = $(pkgincludedir)/srfi
@@ -91,9 +91,9 @@ TAGS_FILES = $(srfi_DATA)
GUILE_SNARF = ../libguile/guile-snarf
-MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
SUFFIXES = .x
.c.x: