diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-08-25 11:20:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-08-25 22:08:45 +0200 |
| commit | bfb2e1135842460d450cd514b8ef692a752db26c (patch) | |
| tree | 6d0d9bfe7eb8a82c651faa6327c1c89ef2749d44 | |
| parent | 4b7513463d20acca02ed233583fef958352f2c71 (diff) | |
Use $(GCC_CFLAGS) for `-Werror' et al. so that it's not used to compile
Gnulib code.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libguile/ChangeLog | 5 | ||||
| -rw-r--r-- | libguile/Makefile.am | 6 | ||||
| -rw-r--r-- | srfi/ChangeLog | 4 | ||||
| -rw-r--r-- | srfi/Makefile.am | 2 | ||||
| -rw-r--r-- | test-suite/ChangeLog | 4 | ||||
| -rw-r--r-- | test-suite/standalone/Makefile.am | 2 |
8 files changed, 30 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2008-08-25 Ludovic Courtès <ludo@gnu.org> + + * configure.in (GCC_CFLAGS): New variable. Store GCC flags like + `-Werror' inside it so that they are not used when compiling + Gnulib modules. + 2008-08-21 Ludovic Courtès <ludo@gnu.org> * autogen.sh: Don't use `gnulib-tool', use the Gnulib files diff --git a/configure.in b/configure.in index ede0d15c1..fcccb2048 100644 --- a/configure.in +++ b/configure.in @@ -1417,17 +1417,19 @@ case "$GCC" in ## less than exasperating. ## -Wpointer-arith was here too, but something changed in gcc/glibc ## and it became equally exasperating (gcc 2.95 and/or glibc 2.1.2). - CFLAGS="$CFLAGS -Wall -Wmissing-prototypes" + GCC_CFLAGS="-Wall -Wmissing-prototypes" # Do this here so we don't screw up any of the tests above that might # not be "warning free" if test "${GUILE_ERROR_ON_WARNING}" = yes then - CFLAGS="${CFLAGS} -Werror" + GCC_CFLAGS="${GCC_CFLAGS} -Werror" enable_compile_warnings=no fi ;; esac +AC_SUBST(GCC_CFLAGS) + ## If we're creating a shared library (using libtool!), then we'll ## need to generate a list of .lo files corresponding to the .o files ## given in LIBOBJS. We'll call it LIBLOBJS. diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 518dcd466..a3c9767f9 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +2008-08-25 Ludovic Courtès <ludo@gnu.org> + + * Makefile.am (AM_CFLAGS): New. + (guile_CFLAGS, libguile_la_CFLAGS): Use it. + 2008-08-20 Ludovic Courtès <ludo@gnu.org> * eval.c, filesys.c, gc.c, numbers.c, stime.c, threads.c: Don't diff --git a/libguile/Makefile.am b/libguile/Makefile.am index a68ebbaa2..579ae89a2 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -35,6 +35,8 @@ DEFAULT_INCLUDES = AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CFLAGS = $(GCC_CFLAGS) + ## The Gnulib Libtool archive. gnulib_library = $(top_builddir)/lib/libgnu.la @@ -97,11 +99,11 @@ guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile guile_SOURCES = guile.c -guile_CFLAGS = $(GUILE_CFLAGS) +guile_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS) guile_LDADD = libguile.la guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS) -libguile_la_CFLAGS = $(GUILE_CFLAGS) +libguile_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS) libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \ chars.c continuations.c convert.c debug.c deprecation.c \ diff --git a/srfi/ChangeLog b/srfi/ChangeLog index f35b25e16..5cba7e7b5 100644 --- a/srfi/ChangeLog +++ b/srfi/ChangeLog @@ -1,3 +1,7 @@ +2008-08-25 Ludovic Courtès <ludo@gnu.org> + + * Makefile.am (AM_CFLAGS): New. + 2008-06-28 Ludovic Courtès <ludo@gnu.org> * Makefile.am (INCLUDES): Renamed to... diff --git a/srfi/Makefile.am b/srfi/Makefile.am index 64858cd27..bb69bbbf2 100644 --- a/srfi/Makefile.am +++ b/srfi/Makefile.am @@ -29,6 +29,8 @@ DEFS = @DEFS@ @EXTRA_DEFS@ AM_CPPFLAGS = -I.. -I$(srcdir)/.. \ -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CFLAGS = $(GCC_CFLAGS) + srfiincludedir = $(pkgincludedir)/srfi # These headers are visible as <guile/srfi/mumble.h> diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog index 0d6b54c9a..1c2ff80f2 100644 --- a/test-suite/ChangeLog +++ b/test-suite/ChangeLog @@ -1,3 +1,7 @@ +2008-08-25 Ludovic Courtès <ludo@gnu.org> + + * standalone/Makefile.am (test_cflags): Add `$(GCC_CFLAGS)'. + 2008-08-19 Ludovic Courtès <ludo@gnu.org> * tests/goops.test (object update)[changing class, `hell' in diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am index ae68d5fe1..adbe0c84f 100644 --- a/test-suite/standalone/Makefile.am +++ b/test-suite/standalone/Makefile.am @@ -34,7 +34,7 @@ test_cflags = \ -I$(top_srcdir)/test-suite/standalone \ -I$(top_srcdir) \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ - $(EXTRA_DEFS) $(GUILE_CFLAGS) + $(EXTRA_DEFS) $(GUILE_CFLAGS) $(GCC_CFLAGS) AM_LDFLAGS = $(GUILE_CFLAGS) |