Move 'tools' related build rules into tools/module.mk; fixed remainder of bug #1100125 (I hope...)
svn-id: r16547
This commit is contained in:
Max Horn
parent
89e6030c58
commit
2f77e27ca3
3 changed files with 81 additions and 39 deletions
37
Makefile
37
Makefile
|
|
@ -83,41 +83,6 @@ deb:
|
|||
debian/prepare
|
||||
fakeroot debian/rules binary
|
||||
|
||||
#######################################################################
|
||||
# Tools directory
|
||||
#######################################################################
|
||||
|
||||
TOOLS := tools/convbdf$(EXEEXT) tools/md5table$(EXEEXT)
|
||||
|
||||
tools: $(TOOLS)
|
||||
|
||||
tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
|
||||
$(MKDIR) tools/$(DEPDIR)
|
||||
$(CC) -Wall -o $@ $<
|
||||
|
||||
tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
|
||||
$(MKDIR) tools/$(DEPDIR)
|
||||
$(CC) -Wall -o $@ $<
|
||||
|
||||
#simon/simon-md5.h: $(srcdir)/tools/simon-md5.txt
|
||||
# tools/md5table$(EXEEXT) --c++ < $< > $@
|
||||
|
||||
#scumm/scumm-md5.h: $(srcdir)/tools/scumm-md5.txt
|
||||
# tools/md5table$(EXEEXT) --c++ < $< > $@
|
||||
|
||||
credits:
|
||||
$(srcdir)/tools/credits.pl --text > AUTHORS
|
||||
$(srcdir)/tools/credits.pl --html > ../web/credits.inc
|
||||
$(srcdir)/tools/credits.pl --cpp > gui/credits.h
|
||||
$(srcdir)/tools/credits.pl --xml > ../docs/docbook/credits.xml
|
||||
|
||||
md5scumm: tools/md5table$(EXEEXT)
|
||||
tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/scumm-md5.txt > scumm/scumm-md5.h
|
||||
tools/md5table$(EXEEXT) --php < $(srcdir)/tools/scumm-md5.txt > ../web/docs/md5.inc
|
||||
|
||||
md5simon: tools/md5table$(EXEEXT)
|
||||
tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/simon-md5.txt > simon/simon-md5.h
|
||||
|
||||
#######################################################################
|
||||
# Unit/regression tests #
|
||||
# In order to use 'make test' you have to install cxxtest inside the #
|
||||
|
|
@ -187,4 +152,4 @@ win32dist: scummvm$(EXEEXT)
|
|||
u2d $(WIN32PATH)/*.txt
|
||||
|
||||
|
||||
.PHONY: deb bundle test osxsnap win32dist dist install uninstall credits tools
|
||||
.PHONY: deb bundle test osxsnap win32dist dist install uninstall
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
######################################################################
|
||||
# The defaul build target: just build the scummvm executable
|
||||
######################################################################
|
||||
all: tools $(EXECUTABLE) plugins
|
||||
all: $(EXECUTABLE) plugins
|
||||
|
||||
|
||||
######################################################################
|
||||
|
|
@ -31,7 +31,7 @@ DEPDIR := .deps
|
|||
# Module settings
|
||||
######################################################################
|
||||
|
||||
MODULES := base $(MODULES)
|
||||
MODULES := tools base $(MODULES)
|
||||
|
||||
ifdef DISABLE_SCUMM
|
||||
DEFINES += -DDISABLE_SCUMM
|
||||
|
|
@ -122,7 +122,7 @@ distclean: clean
|
|||
$(RM) build.rules config.h config.mak config.log
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(EXECUTABLE) $(TOOLS)
|
||||
$(RM) $(OBJS) $(EXECUTABLE)
|
||||
|
||||
.PHONY: all clean dist distclean plugins
|
||||
|
||||
|
|
|
|||
77
tools/module.mk
Normal file
77
tools/module.mk
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
MODULE := tools
|
||||
|
||||
MODULE_DIRS += \
|
||||
tools
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Tools directory
|
||||
#######################################################################
|
||||
|
||||
TOOLS := tools/convbdf$(EXEEXT) tools/md5table$(EXEEXT)
|
||||
|
||||
|
||||
# Make sure the 'all' / 'clean' targets build/clean the tools, too
|
||||
all: tools
|
||||
clean: clean-tools
|
||||
|
||||
# Main target
|
||||
tools: $(TOOLS)
|
||||
|
||||
clean-tools:
|
||||
-$(RM) $(TOOLS)
|
||||
|
||||
#
|
||||
# Build rules for the tools
|
||||
#
|
||||
|
||||
tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
|
||||
$(MKDIR) tools/$(DEPDIR)
|
||||
$(CC) -Wall -o $@ $<
|
||||
|
||||
tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
|
||||
$(MKDIR) tools/$(DEPDIR)
|
||||
$(CC) -Wall -o $@ $<
|
||||
|
||||
#
|
||||
# Rules to explicitly rebuild the credits / MD5 tables
|
||||
#
|
||||
|
||||
credits:
|
||||
$(srcdir)/tools/credits.pl --text > AUTHORS
|
||||
$(srcdir)/tools/credits.pl --html > ../web/credits.inc
|
||||
$(srcdir)/tools/credits.pl --cpp > gui/credits.h
|
||||
$(srcdir)/tools/credits.pl --xml > ../docs/docbook/credits.xml
|
||||
|
||||
md5scumm: tools/md5table$(EXEEXT)
|
||||
tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/scumm-md5.txt > scumm/scumm-md5.h
|
||||
tools/md5table$(EXEEXT) --php < $(srcdir)/tools/scumm-md5.txt > ../web/docs/md5.inc
|
||||
|
||||
md5simon: tools/md5table$(EXEEXT)
|
||||
tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/simon-md5.txt > simon/simon-md5.h
|
||||
|
||||
|
||||
#
|
||||
# Rules which automatically and implicitly rebuild the credits and
|
||||
# MD5 tables when needed.
|
||||
# These are currently disabled, because if the input data changes, then
|
||||
# the generated files should be checked in, too. Otherwise, we'd reduce
|
||||
# portability to system on which our tools can't (automatically) be
|
||||
# run for some reason.
|
||||
#
|
||||
|
||||
#simon/simon-md5.h: $(srcdir)/tools/simon-md5.txt tools/md5table$(EXEEXT)
|
||||
# tools/md5table$(EXEEXT) --c++ < $< > $@
|
||||
|
||||
#scumm/scumm-md5.h: $(srcdir)/tools/scumm-md5.txt tools/md5table$(EXEEXT)
|
||||
# tools/md5table$(EXEEXT) --c++ < $< > $@
|
||||
|
||||
#AUTHORS: $(srcdir)/tools/credits.pl
|
||||
# $(srcdir)/tools/credits.pl --text > $@
|
||||
|
||||
#gui/credits.h: $(srcdir)/tools/credits.pl
|
||||
# $(srcdir)/tools/credits.pl --cpp > $@
|
||||
|
||||
|
||||
|
||||
.PHONY: clean-tools tools credits md5scumm md5simon
|
||||
Loading…
Add table
Add a link
Reference in a new issue