From b0de3e9e30113e669ad7944579ec4e2d10163758 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 5 Jun 1997 11:28:54 +0000 Subject: Update. 1997-06-04 05:09 Miles Bader * argp/argp-help.c (_help): Use uparams.usage_indent instead of the USAGE_INDENT macro. * manual/summary.awk: Strip trailing commas from node-names. * manual/.cvsignore: Ignore chapters-incl[12] rather than chapters-incl. * manual/Makefile (%.c.texi): Deal with multiple @-commands on a single line. * manual/string.texi (Argz Functions, Envz Functions): Add magic comments for generating summary.texi. 1997-06-02 22:18 Miles Bader * manual/argp.texi: New file. * manual/examples/argp-ex1.c, manual/examples/argp-ex2.c, manual/examples/argp-ex3.c, manual/examples/argp-ex4.c: New files. * manual/Makefile [chapters] (chapters-incl1): New rule & include. [chapters-incl1] (chapters-incl2): New rule & include. (chapters-incl): Set based on $(chapters-incl1) & $(chapters-incl2). * manual/maint.texi (Contributors): Give myself credit. 1997-06-01 15:01 Miles Bader * manual/getopt.texi: New file. * manual/startup.texi: Mention argp_parse in places that previously mentioned only getopt. Include getopt.texi (now containing all the getopt nodes that used to be here) and argp.texi. (Program Arguments): Move parsing bits into the new Parsing Program Arguments node. (Parsing Program Arguments): New node. (Parsing Options, Example of Getopt, Long Options, Long Option Example): Nodes removed. * manual/libc.texinfo: (Program Arguments): Menu updated. (Parsing Program Arguments): New menu. --- manual/Makefile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'manual/Makefile') diff --git a/manual/Makefile b/manual/Makefile index 94cc59c..5f05524 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -39,11 +39,20 @@ endif chapters: libc.texinfo $(find-includes) ifdef chapters --include chapters-incl -chapters-incl: $(chapters) +# @includes in chapter files +-include chapters-incl1 +chapters-incl1: $(chapters) $(find-includes) -chapters-incl := $(filter-out summary.texi,$(chapters-incl)) +chapters-incl1 := $(filter-out summary.texi,$(chapters-incl1)) endif +ifdef chapters-incl1 +# @includes in files included by chapter files, if any +-include chapters-incl2 +chapters-incl2: $(chapters-incl1) + $(find-includes) +endif + +chapters-incl := $(chapters-incl1) $(chapters-incl2) define find-includes (echo '$(@F) :=' \\ ;\ @@ -75,7 +84,7 @@ dir-add.texi: xtract-typefun.awk $(chapters) sed -e 's,[{}],@&,g' \ -e 's,/\*\(@.*\)\*/,\1,g' \ -e 's,/\* *,/* @r{,g' -e 's, *\*/,} */,' \ - -e 's/\(@[a-z][a-z]*\)@{\([^}]*\)@}/\1{\2}/'\ + -e 's/\(@[a-z][a-z]*\)@{\([^}]*\)@}/\1{\2}/g'\ $< | expand > $@.new mv -f $@.new $@ -- cgit v1.1