ref: 95ef264ebab11e76adf523f8196b3f3ad5ae34ae
parent: 4cc85f4c99939e301ff3d1eb690be7475ac131f0
parent: b8dfaffcb5bda84289b534b8252f0cc58e21a219
author: Simon Howard <fraggle+github@gmail.com>
date: Mon Feb 3 02:06:03 EST 2014
Merge pull request #329 from fabiangreffrath/master Some improvements to the build system
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,3 +19,4 @@
@PROGRAM_PREFIX@setup.png : setup.png
cp setup.png $@
+CLEANFILES = $(icons_DATA)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,32 +16,43 @@
if HAVE_PYTHON
GENERATED_MAN_PAGES = \
- chocolate-doom.6 \
+ @PROGRAM_PREFIX@doom.6 \
default.cfg.5 \
- chocolate-doom.cfg.5 \
- chocolate-heretic.6 \
+ @PROGRAM_PREFIX@doom.cfg.5 \
+ @PROGRAM_PREFIX@heretic.6 \
heretic.cfg.5 \
- chocolate-heretic.cfg.5 \
- chocolate-hexen.6 \
+ @PROGRAM_PREFIX@heretic.cfg.5 \
+ @PROGRAM_PREFIX@hexen.6 \
hexen.cfg.5 \
- chocolate-hexen.cfg.5 \
- chocolate-strife.6 \
+ @PROGRAM_PREFIX@hexen.cfg.5 \
+ @PROGRAM_PREFIX@strife.6 \
strife.cfg.5 \
- chocolate-strife.cfg.5
+ @PROGRAM_PREFIX@strife.cfg.5
-man_MANS = chocolate-server.6 \
- chocolate-setup.6 \
- $(GENERATED_MAN_PAGES)
+SETUP_MAN_PAGES = \
+ @PROGRAM_PREFIX@doom-setup.6 \
+ @PROGRAM_PREFIX@heretic-setup.6 \
+ @PROGRAM_PREFIX@hexen-setup.6 \
+ @PROGRAM_PREFIX@strife-setup.6
+man_MANS = @PROGRAM_PREFIX@server.6 \
+ @PROGRAM_PREFIX@setup.6 \
+ $(GENERATED_MAN_PAGES) \
+ $(SETUP_MAN_PAGES)
+
doomdocs_DATA = INSTALL.doom CMDLINE.doom
hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic
hexendocs_DATA = INSTALL.hexen CMDLINE.hexen
strifedocs_DATA = INSTALL.strife CMDLINE.strife
-CLEANFILES = $(GENERATED_MAN_PAGES) $(doomdocs_DATA) $(hereticdocs_DATA) \
+CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
+ $(doomdocs_DATA) $(hereticdocs_DATA) \
$(hexendocs_DATA) $(strifedocs_DATA)
-chocolate-doom.6: ../src $(MANPAGE_GEN_FILES)
+$(SETUP_MAN_PAGES): @PROGRAM_PREFIX@setup.6
+ cp $< $@
+
+@PROGRAM_PREFIX@doom.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g doom -m doom.template ../src ../src/doom > $@
default.cfg.5: ../src default.cfg.template
@@ -48,7 +59,7 @@
./docgen -g doom -m default.cfg.template \
-c default ../src/m_config.c > $@
-chocolate-doom.cfg.5: ../src extra.cfg.template
+@PROGRAM_PREFIX@doom.cfg.5: ../src extra.cfg.template
./docgen -g doom -m extra.cfg.template \
-c extended ../src/m_config.c > $@
@@ -59,7 +70,7 @@
./simplecpp -DDOOM -DPRECOMPILED < INSTALL.template > $@
-chocolate-heretic.6: ../src $(MANPAGE_GEN_FILES)
+@PROGRAM_PREFIX@heretic.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g heretic -m heretic.template ../src ../src/heretic > $@
heretic.cfg.5: ../src default.cfg.template
@@ -66,7 +77,7 @@
./docgen -g heretic -m default.cfg.template \
-c default ../src/m_config.c > $@
-chocolate-heretic.cfg.5: ../src extra.cfg.template
+@PROGRAM_PREFIX@heretic.cfg.5: ../src extra.cfg.template
./docgen -g heretic -m extra.cfg.template \
-c extended ../src/m_config.c > $@
@@ -77,7 +88,7 @@
./simplecpp -DHERETIC -DPRECOMPILED < INSTALL.template > $@
-chocolate-hexen.6: ../src $(MANPAGE_GEN_FILES)
+@PROGRAM_PREFIX@hexen.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g hexen -m hexen.template ../src ../src/hexen > $@
hexen.cfg.5: ../src default.cfg.template
@@ -84,7 +95,7 @@
./docgen -g hexen -m default.cfg.template \
-c default ../src/m_config.c > $@
-chocolate-hexen.cfg.5: ../src extra.cfg.template
+@PROGRAM_PREFIX@hexen.cfg.5: ../src extra.cfg.template
./docgen -g hexen -m extra.cfg.template \
-c extended ../src/m_config.c > $@
@@ -95,7 +106,7 @@
./simplecpp -DHEXEN -DPRECOMPILED < INSTALL.template > $@
-chocolate-strife.6: ../src $(MANPAGE_GEN_FILES)
+@PROGRAM_PREFIX@strife.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g strife -m strife.template ../src ../src/strife > $@
strife.cfg.5: ../src default.cfg.template
@@ -102,7 +113,7 @@
./docgen -g strife -m default.cfg.template \
-c default ../src/m_config.c > $@
-chocolate-strife.cfg.5: ../src extra.cfg.template
+@PROGRAM_PREFIX@strife.cfg.5: ../src extra.cfg.template
./docgen -g strife -m extra.cfg.template \
-c extended ../src/m_config.c > $@