From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 28 Jun 2008 20:00:44 +0000 (+0200)
Subject: Modernize Automake files.
X-Git-Url: https://git.hcoop.net/bpt/guile.git/commitdiff_plain/47871d5a161400e87999b7e28a85cb9022610238?ds=sidebyside

Modernize Automake files.
---

diff --git a/ChangeLog b/ChangeLog
index dc49d16c8..7ee19af5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-28  Ludovic Courtès  <ludo@gnu.org>
+
+	* configure.in: Use Automake with `-Wall -Wno-override'.
+
 2008-05-07  Ludovic Courtès  <ludo@gnu.org>
 
 	Guile 1.8.5 released.
diff --git a/configure.in b/configure.in
index 0afefad27..5f72d357c 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
 
-AM_INIT_AUTOMAKE([gnu no-define check-news])
+AM_INIT_AUTOMAKE([gnu no-define check-news -Wall -Wno-override])
 
 AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
 AC_CONFIG_SRCDIR([GUILE-VERSION])
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index c5bab5b41..8f3ccfc3c 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,9 @@
 2008-06-28  Ludovic Courtès  <ludo@gnu.org>
 
+	* Makefile.am (INCLUDES): Renamed to...
+	(AM_CPPFLAGS): this, to match current Automake conventions.
+	Users updated.
+
 	* tags.h (SCM_UNPACK): Disable type-checking for `__DECC' and
 	`__HP_cc'.  Reported by Peter O'Gorman <pogma@thewrittenword.com>.
 
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 487b8b274..6acdf1faf 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -32,8 +32,8 @@ DEFAULT_INCLUDES =
 ## 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$(top_srcdir) -I$(top_builddir)		\
-	   -I$(top_srcdir)/lib -I$(top_builddir)/lib
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)		\
+	      -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 ## The Gnulib Libtool archive.
 gnulib_library = $(top_builddir)/lib/libgnu.la
@@ -53,7 +53,7 @@ gen_scmconfig_SOURCES = gen-scmconfig.c
 ## For some reason, OBJEXT does not include the dot
 gen-scmconfig.$(OBJEXT): gen-scmconfig.c
 	if [ "$(cross_compiling)" = "yes" ]; then \
-		$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ $<; \
+		$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) -c -o $@ $<; \
 	else \
 		$(COMPILE) -c -o $@ $<; \
 	fi
@@ -81,7 +81,7 @@ guile_filter_doc_snarfage_SOURCES = c-tokenize.c
 ## For some reason, OBJEXT does not include the dot
 c-tokenize.$(OBJEXT): c-tokenize.c
 	if [ "$(cross_compiling)" = "yes" ]; then \
-		$(CC_FOR_BUILD) $(DEFS) $(INCLUDES) -c -o $@ $<; \
+		$(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
 	else \
 		$(COMPILE) -c -o $@ $<; \
 	fi
@@ -290,7 +290,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@mv libpath.tmp libpath.h
 
 
-snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 
 SUFFIXES = .x .doc
 .c.x:
@@ -340,7 +340,7 @@ schemelibdir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)
 schemelib_DATA = guile-procedures.txt
 
 ## Add -MG to make the .x magic work with auto-dep code.
-MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 
 cpp_err_symbols.c: cpp_err_symbols.in cpp_cnvt.awk
 	$(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols.in > \
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: