commit 110d279326e33d6f2e55123ec47b663286a78a6d
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Sep 15 21:04:36 2013 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Sep 15 21:04:36 2013 +0000
Remove top-level CMDLINE documentation file and generate multiple
CMDLINE files, one for each game.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2648
---
Makefile.am | 8 --------
man/Makefile.am | 14 +++++++++++++-
pkg/config.make.in | 4 +---
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 477f4207..074c1112 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ CODEBLOCKS_FILES= \
codeblocks/setup-res.rc
DOC_FILES= \
- CMDLINE \
README \
README.OPL \
NEWS \
@@ -60,13 +59,6 @@ DIST_SUBDIRS=pkg $(SUBDIRS)
if HAVE_PYTHON
-noinst_DATA=CMDLINE
-
-# TODO: CMDLINE only documents the Doom command line, not other games.
-
-CMDLINE : src/
- ./man/docgen -p man/CMDLINE.template src/ src/doom/ > $@
-
INSTALL : man/INSTALL.template man/simplecpp
./man/simplecpp < man/INSTALL.template > $@
diff --git a/man/Makefile.am b/man/Makefile.am
index c8811db3..5eb787f1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,7 +27,8 @@ man_MANS=chocolate-server.6 \
strife.cfg.5 \
chocolate-strife.cfg.5
-nodist_doc_DATA=INSTALL
+nodist_doc_DATA=INSTALL CMDLINE.doom CMDLINE.heretic \
+ CMDLINE.hexen CMDLINE.strife
@@ -42,6 +43,9 @@ chocolate-doom.cfg.5: ../src extra.cfg.template
./docgen -g doom -m extra.cfg.template \
-c extended ../src/m_config.c > $@
+CMDLINE.doom : ../src ../src/doom
+ ./docgen -p CMDLINE.template ../src/ ../src/doom/ > $@
+
chocolate-heretic.6: ../src $(MANPAGE_GEN_FILES)
@@ -55,6 +59,8 @@ chocolate-heretic.cfg.5: ../src extra.cfg.template
./docgen -g heretic -m extra.cfg.template \
-c extended ../src/m_config.c > $@
+CMDLINE.heretic : ../src ../src/heretic
+ ./docgen -p CMDLINE.template ../src/ ../src/heretic/ > $@
chocolate-hexen.6: ../src $(MANPAGE_GEN_FILES)
@@ -68,6 +74,9 @@ chocolate-hexen.cfg.5: ../src extra.cfg.template
./docgen -g hexen -m extra.cfg.template \
-c extended ../src/m_config.c > $@
+CMDLINE.hexen : ../src ../src/hexen
+ ./docgen -p CMDLINE.template ../src/ ../src/hexen/ > $@
+
chocolate-strife.6: ../src $(MANPAGE_GEN_FILES)
@@ -81,6 +90,9 @@ chocolate-strife.cfg.5: ../src extra.cfg.template
./docgen -g strife -m extra.cfg.template \
-c extended ../src/m_config.c > $@
+CMDLINE.strife : ../src ../src/strife
+ ./docgen -p CMDLINE.template ../src/ ../src/strife/ > $@
+
INSTALL: INSTALL.template
diff --git a/pkg/config.make.in b/pkg/config.make.in
index 8f94f945..b5e0209a 100644
--- a/pkg/config.make.in
+++ b/pkg/config.make.in
@@ -23,7 +23,5 @@ DOC_FILES = README \
COPYING \
ChangeLog \
NEWS \
- NOT-BUGS \
- CMDLINE \
- TODO
+ NOT-BUGS