diff options
| author | Keisuke Nishida <kxn30@po.cwru.edu> | 2001-03-07 06:06:16 +0000 |
|---|---|---|
| committer | Keisuke Nishida <kxn30@po.cwru.edu> | 2001-03-07 06:06:16 +0000 |
| commit | 66418d34653d7a5bef7829f7bf1416e26f849541 (patch) | |
| tree | 11ab53b618ea3527c18cefcdc02cb0df2e416b07 | |
| parent | 387c1a3bc0adc035dd5aa068288699b50105d250 (diff) | |
fix problems with gcc-2.96.
| -rw-r--r-- | libguile/ChangeLog | 9 | ||||
| -rw-r--r-- | libguile/Makefile.am | 5 | ||||
| -rw-r--r-- | libguile/guile-snarf.awk.in | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 4528fab21..bb68ee217 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,12 @@ +2001-03-07 Keisuke Nishida <kxn30@po.cwru.edu> + + * Makefile.am (*.x): Add dependency on snarf.h and guile-doc-snarf.in. + (*.doc): Add dependency on guile-snarf.awk.in. + + * guile-snarf.awk.in: Neglect spaces at the end of + SCM_SNARF_DOCSTRING_END. Skip lines "# NN ..." in the + middle of docstrings. (To avoid the problem with gcc-2.96.) + 2001-03-06 Dirk Herrmann <D.Herrmann@tu-bs.de> * coop-threads.c (scm_call_with_new_thread), load.c diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 350282d61..648cfdbe2 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -175,10 +175,13 @@ SUFFIXES = .x .doc .c.x: ./guile-doc-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \ || { rm $@; false; } -.x.doc: +.x.doc: ./guile-doc-snarf $(srcdir)/$*.c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(srcdir)/$*.c > /dev/null \ || { rm $@; false; } +*.x: snarf.h guile-doc-snarf.in +*.doc: guile-snarf.awk.in + error.x: cpp_err_symbols.c posix.x: cpp_sig_symbols.c load.x: libpath.h diff --git a/libguile/guile-snarf.awk.in b/libguile/guile-snarf.awk.in index 5c045fcf3..034aa9e6c 100644 --- a/libguile/guile-snarf.awk.in +++ b/libguile/guile-snarf.awk.in @@ -98,6 +98,7 @@ BEGIN { FS="|"; /SCM_SNARF_DOCSTRING_START/,/SCM_SNARF_DOCSTRING_END.*$/ { copy = $0; gsub(/.*SCM_SNARF_DOCSTRING_START/,"",copy); + sub(/^\#.*/,"", copy); sub(/^[ \t]*\"?/,"", copy); sub(/\"?[ \t]*SCM_SNARF_DOCSTRING_END.*$/,"", copy); gsub(/\\n\\n\"?/,"\n",copy); @@ -107,7 +108,7 @@ BEGIN { FS="|"; if (copy != "") { print copy > dot_doc_file } } -/SCM_SNARF_DOCSTRING_END[ \t]/ { print "@end deffn" >> dot_doc_file; } +/SCM_SNARF_DOCSTRING_END[ \t]*/ { print "@end deffn" >> dot_doc_file; } /\*&\*&\*&\*SCM_ARG_BETTER_BE_IN_POSITION/ { copy = $0; sub(/.*\*&\*&\*&\*SCM_ARG_BETTER_BE_IN_POSITION\([ \t]*/,"",copy); |