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

Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

Browse source
This commit is contained in:
Simon Howard 2016-01-03 15:29:07 +01:00
commit 3b7f8c554f
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
man/Makefile.am
View file

@ -54,7 +54,7 @@ MANDIR = $(top_srcdir)/man
DOCGEN = $(MANDIR)/docgen
$(SETUP_MAN_PAGES): chocolate-setup.6
cp $< $@
cp chocolate-setup.6 $@
@PROGRAM_PREFIX@doom.6: ../src $(MANPAGE_GEN_FILES)
$(DOCGEN) -g doom -m doom.template $(top_srcdir)/src $(top_srcdir)/src/doom > $@

11
src/Makefile.am
View file

@ -186,7 +186,7 @@ endif
@PROGRAM_PREFIX@strife_LDADD = strife/libstrife.a $(EXTRA_LIBS)
$(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT)
cp $< $@
cp @PROGRAM_PREFIX@setup$(EXEEXT) $@
# Source files needed for chocolate-setup:
@ -272,13 +272,14 @@ CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA)
if HAVE_PYTHON
icon.c : $(top_builddir)/data/doom8.ico
$(top_builddir)/data/convert-icon $< $@
$(top_builddir)/data/convert-icon $(top_builddir)/data/doom8.ico $@
endif
midiread : midifile.c
$(CC) -DTEST $(CFLAGS) @LDFLAGS@ $< -o $@
$(CC) -DTEST $(CFLAGS) @LDFLAGS@ midifile.c -o $@
mus2mid : mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c
$(CC) -DSTANDALONE -I$(top_builddir) $(CFLAGS) @LDFLAGS@ $^ -o $@
MUS2MID_SOURCES = mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c
mus2mid : $(MUS2MID_SOURCES)
$(CC) -DSTANDALONE -I$(top_builddir) $(CFLAGS) @LDFLAGS@ $(MUS2MID_SOURCES) -o $@

2
src/setup/Makefile.am
View file

@ -39,7 +39,7 @@ CLEANFILES = $(app_DATA)
if HAVE_PYTHON
setup_icon.c : $(top_builddir)/data/setup8.ico
$(top_builddir)/data/convert-icon $^ $@
$(top_builddir)/data/convert-icon $(top_builddir)/data/setup8.ico $@
endif