diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2007-08-03 15:26:34 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-08-08 11:44:42 +0200 |
| commit | c5d8827a25198fb152a8d5c7b75e36cee2f73fd2 (patch) | |
| tree | 40c0e5cf19adee6193a175ff53b0a176da1c3be6 | |
| parent | f859ecb5debcbd2eaafe03bda0f51650df9017ad (diff) | |
| download | gnutls-c5d8827a25198fb152a8d5c7b75e36cee2f73fd2.tar.gz | |
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'.
Signed-off-by: Simon Josefsson <simon@josefsson.org>
| -rw-r--r-- | doc/Makefile.am | 9 | ||||
| -rw-r--r-- | guile/src/Makefile.am | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 3437f73465..70a5ca45d9 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 8e3cdac6fe..6d65b371d5 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 |