jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some improvements to the build system

Browse source 
1) Instead of copying chocolate-setup into chocolate-{doom,heretic,hexen,strife}-setup,
   respectively, check in configure for symbolic linking and use that if available
   (falls back to "cp -pR" if not).
2) Add $(icons_DATA) to CLEANFILES so they get removed in clean phase; they are
   generated from doom-png and setup.png, respectively.
3) Consistently use @PROGRAM_PREFIX@ instead of the hard-coded "chocolate-" in
   the rules for the man pages.
4) Generate one man page for each setup program by symbolic linking of
   chocolate-setup.6 (see 1), add them to the list of installed man pages and
   to CLEANFILES.
5) Remove the redundant $(EXEEXT) suffix from the setup binaries (they were missing
   for execgames_PROGRAMS, anyway)
This commit is contained in:
Fabian Greffrath 2014-01-20 11:00:53 +01:00
parent 29e7b9d813
commit 08ad5553fd
4 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -12,6 +12,7 @@ orig_CFLAGS="$CFLAGS"
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LN_S
AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
OPT_LEVEL=2

1
data/Makefile.am
View file

@ -19,3 +19,4 @@ icons_DATA = @PROGRAM_PREFIX@doom.png \
@PROGRAM_PREFIX@setup.png : setup.png
cp setup.png $@
CLEANFILES = $(icons_DATA)

51
man/Makefile.am
View file

@ -16,39 +16,50 @@ strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
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
$(LN_S) $< $@
@PROGRAM_PREFIX@doom.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g doom -m doom.template ../src ../src/doom > $@
default.cfg.5: ../src default.cfg.template
./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,14 +70,14 @@ INSTALL.doom: INSTALL.template
./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
./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,14 +88,14 @@ INSTALL.heretic: INSTALL.template
./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
./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,14 +106,14 @@ INSTALL.hexen: INSTALL.template
./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
./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 > $@

17
src/Makefile.am
View file

@ -7,14 +7,13 @@ execgames_PROGRAMS = @PROGRAM_PREFIX@doom \
@PROGRAM_PREFIX@heretic \
@PROGRAM_PREFIX@hexen \
@PROGRAM_PREFIX@strife \
@PROGRAM_PREFIX@server
@PROGRAM_PREFIX@server \
@PROGRAM_PREFIX@setup
noinst_PROGRAMS = @PROGRAM_PREFIX@setup
SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT) \
@PROGRAM_PREFIX@heretic-setup$(EXEEXT) \
@PROGRAM_PREFIX@hexen-setup$(EXEEXT) \
@PROGRAM_PREFIX@strife-setup$(EXEEXT)
SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup \
@PROGRAM_PREFIX@heretic-setup \
@PROGRAM_PREFIX@hexen-setup \
@PROGRAM_PREFIX@strife-setup
execgames_SCRIPTS = $(SETUP_BINARIES)
@ -184,8 +183,8 @@ endif
@PROGRAM_PREFIX@strife_LDADD = strife/libstrife.a $(EXTRA_LIBS)
$(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT)
cp $< $@
$(SETUP_BINARIES): @PROGRAM_PREFIX@setup
$(LN_S) $< $@
# Source files needed for chocolate-setup: