summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
Diffstat (limited to 'libguile')
-rw-r--r--libguile/ChangeLog5
-rw-r--r--libguile/Makefile.am6
2 files changed, 9 insertions, 2 deletions
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 \