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.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 500f4a36cedb6d0396a57b3bd0d68b8327c2a54b..30720647197018a6b0203310441b0f2e3bbd9b18 100644 (file)
--- 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 2102a3da915dc6aec9fef1b05b52b77e936129d9..b71c548fce828d695c4500b71386646a69cbf1bc 100644 (file)
--- 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 d620a31f17578d77661dcad19aee5bddae20753e..dc27d2369e7e87700e74c515ada8c5cb1812c4ca 100644 (file)
--- 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 fdc46c4a9b8502fa8717978288b261d7ff07210f..20eaba987dee62013ff8a213186b546190a34b4c 100644 (file)
--- 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 440e6c309931454dcdab9b3de608d58a004d00c8..2a33229d1e62c3e1fa0156232720fe57e57f5a6b 100644 (file)
--- 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 ();