1 files changed, 10 insertions, 43 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 502c46e..d7d69d1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,65 +37,33 @@ check-format:
                 false; \
         fi
 
-check-pragmas:
-        @check-docs.sh pragmas \
-           '/} option_cache\[\] = {/,/^}/s/[ \t]*{ *"\(.*\)".*/\1/pg' \
-           's/@deffnx* {pragma option} *\([^@, ]*\) .*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
-           $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS) 
-
 check-options:
         @check-docs.sh options \
            '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
            's/@opindex *\([^@,]*\).*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
+           $(top_srcdir)/src/pies.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
                 $(info_TEXINFOS) 
 
 check-config:
         @check-docs.sh 'configuration statements' \
-           '/mf_cfg_param\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
-           's/@deffn {Pies Conf} *\([^@,]*\).*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
+           '/pies_keywords\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           's/@deffn {Config} *\([^@,]*\).*/\1/p' \
+           $(top_srcdir)/src/pies.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
                 $(info_TEXINFOS) 
 
 check-sub-config:
-        @list=`sed -n '/mf_cfg_param\[\] *= *{/,/^}/{s/[ \t]*{ *"\([^,"]*\)", *mu_cfg_section *,.*/\1/pg}' $(top_srcdir)/mfd/main.c`; \
-        for ident in $$list; do \
+        sed -n '/pies_keywords\[\] *= *{/,/^}/{p}' ../src/pies.c|tr  '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \
+        while read ident kw; do \
            check-docs.sh "$$ident configuration statements" \
-           "/$${ident}_section_param"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
-           "s/@deffn {$${ident}}"' *\([^@,]*\).*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
+           "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           "s/@deffn {Config: *$${ident}}"' *\([^@,]*\).*/\1/p' \
+           $(top_srcdir)/src/pies.c $(top_srcdir)/src/acl.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
                 $(info_TEXINFOS); \
         done
 
-check-builtins:
-        @check-docs.sh builtins \
-    '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\
-    's/@deftypefnx\{0,1\} {Built-in Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \
-    $(top_srcdir)/mfd/bi_*.m4 -- \
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS) 
-
-check-mflib:
-        @check-docs.sh "library functions" \
-    '/^[ \t]*func[ \t][ \t]*__/b;/^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \
-    's/@deftypefn {Library Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \
-    $(top_srcdir)/mflib/*.mf -- \
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS)
-
-check-exceptions:
-        @check-docs.sh exceptions \
-     '/typedef enum mf_exception_code {/,/^};/s/[ \t]*mfe_\(.*\),.*/e_\1/p;/typedef enum mf_status_code {/,/^};/s/[ \t]*mf_\(.*\),.*/\1/p' \
-     's/@cindex \([^,][^,]*\), exception type/\1/p'     \
-     $(top_srcdir)/mfd/pies.h -- \
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS) 
-
 check-refs:
         @for file in $(info_TEXINFOS) $(pies_TEXINFOS); \
         do \
@@ -147,9 +115,8 @@ check-unrevised:
           rm $@-t; \
         fi
 
-all-check-docs: check-format check-options check-pragmas \
+all-check-docs: check-format check-options \
                 check-config check-sub-config \
-                check-builtins check-mflib check-exceptions \
                 check-refs check-fixmes check-writeme check-unrevised
 
 check-docs: