From f7435559a78e7bf10ea2aa3bbb2f48184c990261 Mon Sep 17 00:00:00 2001 From: axel Date: Mon, 20 Nov 2006 11:06:20 +1000 Subject: [PATCH] Simplify Makefile by using a wildcard to specify help files darcs-hash:20061120010620-ac50b-1a838bdd75607a503bc8335bb39abd2aa11ac7e8.gz --- Makefile.in | 49 ++++++++----------------------------------------- 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3cb412358..3f4da29ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -133,49 +133,16 @@ MIME_OBJS := mimedb.o print_help.o xdgmimealias.o xdgmime.o \ # -# Files containing documentation for builtins. +# Files containing user documentation # -BUILTIN_DOC_SRC := doc_src/source.txt doc_src/and.txt \ - doc_src/begin.txt doc_src/bg.txt doc_src/bind.txt \ - doc_src/block.txt doc_src/break.txt doc_src/builtin.txt \ - doc_src/case.txt doc_src/cd.txt doc_src/command.txt \ - doc_src/commandline.txt doc_src/complete.txt doc_src/continue.txt \ - doc_src/else.txt doc_src/end.txt doc_src/eval.txt doc_src/exec.txt \ - doc_src/exit.txt doc_src/fg.txt doc_src/for.txt \ - doc_src/function.txt doc_src/functions.txt doc_src/if.txt \ - doc_src/jobs.txt doc_src/not.txt doc_src/or.txt doc_src/random.txt \ - doc_src/return.txt doc_src/read.txt doc_src/set.txt \ - doc_src/status.txt doc_src/switch.txt doc_src/ulimit.txt \ - doc_src/while.txt - - -# -# Files generated by running doxygen on the files in $(BUILTIN_DOC_SRC) -# - -BUILTIN_DOC_HDR := $(BUILTIN_DOC_SRC:.txt=.doxygen) - HDR_FILES := doc_src/index.hdr doc_src/commands.hdr doc_src/design.hdr doc_src/license.hdr doc_src/faq.hdr # # Files containing documentation for external commands. # -CMD_DOC_SRC := doc_src/contains.txt doc_src/count.txt doc_src/dirh.txt \ - doc_src/dirs.txt doc_src/fish.txt doc_src/fish_pager.txt \ - doc_src/fishd.txt doc_src/help.txt doc_src/isatty.txt \ - doc_src/mimedb.txt doc_src/nextd.txt doc_src/open.txt \ - doc_src/popd.txt doc_src/prevd.txt doc_src/psub.txt \ - doc_src/pushd.txt doc_src/set_color.txt doc_src/trap.txt \ - doc_src/type.txt doc_src/umask.txt doc_src/vared.txt - - -# -# Files generated by running doxygen on the files in $(CMD_DOC_SRC) -# - -CMD_DOC_HDR := $(CMD_DOC_SRC:.txt=.doxygen) +DOC_SRC := $(wildcard doc_src/*.txt) # @@ -195,7 +162,7 @@ TEST_IN := $(wildcard tests/test*.in) DOC_SRC_DIR_FILES := doc_src/Doxyfile.in doc_src/index.hdr \ doc_src/license.hdr doc_src/faq.hdr doc_src/design.hdr \ - $(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) + $(DOC_SRC) # @@ -314,7 +281,7 @@ debug: # -user_doc: doc_src/index.hdr doc_src/design.hdr doc_src/license.hdr doc_src/faq.hdr Doxyfile.user user_doc.head.html $(CMD_DOC_SRC) $(BUILTIN_DOC_SRC) +user_doc: doc_src/index.hdr doc_src/design.hdr doc_src/license.hdr doc_src/faq.hdr Doxyfile.user user_doc.head.html $(DOC_SRC) $(MAKE) doc.h # Depend on the sources (*.hdr) and manually make the intermediate as needed doxygen Doxyfile.user touch user_doc @@ -365,11 +332,11 @@ xsel-0.9.6/xsel: xsel-0.9.6 # builtins # -doc_src/commands.hdr:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) +doc_src/commands.hdr:$(DOC_SRC) rm -f commands.tmp; echo "/** \page commands Commands, functions and builtins bundled with fish" >>commands.tmp; echo "Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below. " >>commands.tmp; - for i in `printf "%s\n" $(BUILTIN_DOC_SRC) $(CMD_DOC_SRC)|sort`; do \ + for i in `printf "%s\n" $(DOC_SRC)|sort`; do \ echo "
" >>commands.tmp; \ cat $$i >>commands.tmp; \ echo >>commands.tmp; \ @@ -494,8 +461,8 @@ common.o: $(COMMON_FILES) # There ought to be something simpler. # -doc_src/builtin_doc: $(BUILTIN_DOC_SRC) doc_src/count.txt $(CMD_DOC_SRC) - for i in $(BUILTIN_DOC_SRC) $(CMD_DOC_SRC); do \ +doc_src/builtin_doc: $(DOC_SRC) doc_src/count.txt + for i in $(DOC_SRC); do \ FILE=doc_src/`basename $$i .txt`.doxygen; \ echo "/** \page" `basename $$i .txt` >$$FILE; \ cat $$i >>$$FILE; \