[gnutls-dev] [PATCH] Fix CPPFLAGS for Guile code and documentation

[Ludovic Courtès]

Hi,

While compiling on a pristine machine (where GnuTLS headers were not
installed), I noticed that the CPPFLAGS were wrong for the Guile code
and documentation extraction.  The attached patch fixes it.

I'm not sure that deserves a `NEWS' entry, does it?

Thanks,
Ludovic.

>From 33944f8d88c4167703b24f14ffc1b5648114ce5e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ludovic=20Court=C3=A8s?= <address@hidden>
Date: Fri, 3 Aug 2007 15:26:34 +0200
Subject: [PATCH] Fixed CPPFLAGS for Guile code and documentation.

* doc/Makefile.am (SNARF_CPPFLAGS): Added
  `{top_srcdir,top_builddir}/includes' and `top_builddir'.
  (core.c.texi): Added `&&' between the `make' command and the
  `$(GUILE_FOR_BUILD)' command.  Use `$(MAKE)' instead of `make'.
  (extra.c.texi): Likewise.

* src/Makefile.am (AM_CPPFLAGS): Added
  `{top_srcdir,top_builddir}/includes'.
---
 doc/Makefile.am       |    9 +++++----
 guile/src/Makefile.am |    3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3437f73..70a5ca4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -122,18 +122,19 @@ if HAVE_GUILE
 
 GUILE_FOR_BUILD = $(GUILE) -L $(top_srcdir)/guile/modules
 
-SNARF_CPPFLAGS = -I$(top_srcdir) \
-       -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src
+SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)                     \
+                -I$(top_srcdir)/includes -I$(top_builddir)/includes    \
+                -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src
 
 core.c.texi: $(top_srcdir)/guile/src/core.c
-       make -C ../guile/src built-sources
+       $(MAKE) -C ../guile/src built-sources &&                        \
        $(GUILE_FOR_BUILD) -l "$(srcdir)/extract-guile-c-doc.scm"       \
           -e '(apply main (cdr (command-line)))'                       \
           -- "$^" "$(CPP)" "$(SNARF_CPPFLAGS) $(CPPFLAGS)"             \
           > "$@"
 
 extra.c.texi: $(top_srcdir)/guile/src/extra.c
-       make -C ../guile/src built-sources
+       $(MAKE) -C ../guile/src built-sources &&                        \
        $(GUILE_FOR_BUILD) -l "$(srcdir)/extract-guile-c-doc.scm"       \
           -e '(apply main (cdr (command-line)))'                       \
           -- "$^" "$(CPP)" "$(SNARF_CPPFLAGS) $(CPPFLAGS)"             \
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 8e3cdac..6d65b37 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -58,7 +58,8 @@ libguile_gnutls_extra_v_0_la_LIBADD =         \
   $(builddir)/libguile-gnutls-v-0.la           \
   $(GNULIB_LIBS) $(GUILE_LDFLAGS)
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(builddir)
+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes      \
+              -I$(top_builddir) -I$(builddir)
 
 if HAVE_GCC
 
-- 
1.5.2.4