diff options
| author | Ludovic Courtes <ludo@chbouib.org> | 2007-06-01 00:51:10 +0200 |
|---|---|---|
| committer | Ludovic Courtes <ludo@chbouib.org> | 2007-06-01 00:51:10 +0200 |
| commit | f469cfce51318df3b629d9af210ce4b4e587fac0 (patch) | |
| tree | aa6af42cfdc946f6690483bad19d429ddd9096c6 | |
| parent | 76b313969e72860092441f54cc9a4f52c8eaba57 (diff) | |
| download | gnutls-f469cfce51318df3b629d9af210ce4b4e587fac0.tar.gz | |
Usage "old-fashion" make suffix rules rather than GNU Make patterns.
* doc/Makefile (%.c.texi): Removed.
(core.c.texi, extra.c.texi): New targets.
* guile/src/Makefile.am: Renamed `FILE.c.x' to `FILE.x'.
(SUFFIXES): Removed.
(%.c.x): Removed.
(.c.x): New target.
* guile/src/core.c: Include "core.x" instead of "core.c.x".
* guile/src/errors.c: Likewise.
* guile/src/extra.c: Likewise.
| -rw-r--r-- | doc/Makefile.am | 17 | ||||
| -rw-r--r-- | guile/src/Makefile.am | 5 | ||||
| -rw-r--r-- | guile/src/core.c | 2 | ||||
| -rw-r--r-- | guile/src/errors.c | 2 | ||||
| -rw-r--r-- | guile/src/extra.c | 2 |
5 files changed, 19 insertions, 9 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 500f4a36ce..3072064719 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -128,15 +128,26 @@ GUILE_FOR_BUILD = $(GUILE) -L $(top_srcdir)/guile/modules SNARF_CPPFLAGS = -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src -%.c.texi: $(top_srcdir)/guile/src/%.c +core.c.texi: $(top_srcdir)/guile/src/core.c $(GUILE_FOR_BUILD) -l "$(srcdir)/extract-guile-c-doc.scm" \ -e '(apply main (cdr (command-line)))' \ - -- "$^" "$(CPP)" "$(SNARF_CPPFLAGS)" \ + -- "$^" "$(CPP)" "$(SNARF_CPPFLAGS) $(CPPFLAGS)" \ > "$@" +extra.c.texi: $(top_srcdir)/guile/src/extra.c + $(GUILE_FOR_BUILD) -l "$(srcdir)/extract-guile-c-doc.scm" \ + -e '(apply main (cdr (command-line)))' \ + -- "$^" "$(CPP)" "$(SNARF_CPPFLAGS) $(CPPFLAGS)" \ + > "$@" + + else !HAVE_GUILE -%.c.texi: +core.c.texi: + echo "(Guile not available, documentation not generated.)" > $@ + +extra.c.texi: echo "(Guile not available, documentation not generated.)" > $@ + endif !HAVE_GUILE diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am index 2102a3da91..b71c548fce 100644 --- a/guile/src/Makefile.am +++ b/guile/src/Makefile.am @@ -28,7 +28,7 @@ BUILT_SOURCES = enum-map.i.c smob-types.i.c enums.h smobs.h \ priorities.i.c \ extra-smobs.h extra-enums.h \ extra-enum-map.i.c extra-smob-types.i.c \ - core.c.x errors.c.x extra.c.x + core.x errors.x extra.x CLEANFILES = $(BUILT_SOURCES) @@ -99,6 +99,5 @@ extra-smob-types.i.c: $(srcdir)/make-smob-types.scm snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(CFLAGS) $(AM_CFLAGS) -SUFFIXES = .x -%.c.x: %.c +.c.x: $(guile_snarf) -o $@ $< $(snarfcppopts) diff --git a/guile/src/core.c b/guile/src/core.c index d620a31f17..dc27d2369e 100644 --- a/guile/src/core.c +++ b/guile/src/core.c @@ -2744,7 +2744,7 @@ SCM_DEFINE (scm_gnutls_set_log_level_x, "set-log-level!", 1, 0, 0, void scm_init_gnutls (void) { -#include "core.c.x" +#include "core.x" (void) gnutls_global_init (); diff --git a/guile/src/errors.c b/guile/src/errors.c index fdc46c4a9b..20eaba987d 100644 --- a/guile/src/errors.c +++ b/guile/src/errors.c @@ -46,7 +46,7 @@ scm_gnutls_error (int c_err, const char *c_func) void scm_init_gnutls_error (void) { -#include "errors.c.x" +#include "errors.x" } /* arch-tag: 48f07ecf-65c4-480c-b043-a51eab592d6b diff --git a/guile/src/extra.c b/guile/src/extra.c index 440e6c3099..2a33229d1e 100644 --- a/guile/src/extra.c +++ b/guile/src/extra.c @@ -533,7 +533,7 @@ SCM_DEFINE (scm_gnutls_set_certificate_credentials_openpgp_keys_x, void scm_init_gnutls_extra (void) { -#include "extra.c.x" +#include "extra.x" (void) gnutls_global_init_extra (); |