[Scummvm-cvs-logs] CVS: scummvm Makefile,1.92,1.93 Makefile.common,1.96,1.97

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12349

Modified Files:
	Makefile Makefile.common 
Log Message:
Move 'tools' related build rules into tools/module.mk; fixed remainder of bug #1100125 (I hope...)

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- Makefile	28 Dec 2004 11:40:27 -0000	1.92
+++ Makefile	11 Jan 2005 22:02:04 -0000	1.93
@@ -84,41 +84,6 @@
 	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  #
 # test/cxxtest dir. Get it from http://cxxtest.sourceforge.net.       #
@@ -187,4 +152,4 @@
 	u2d $(WIN32PATH)/*.txt
 
 
-.PHONY: deb bundle test osxsnap win32dist dist install uninstall credits tools
+.PHONY: deb bundle test osxsnap win32dist dist install uninstall

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- Makefile.common	25 Dec 2004 18:34:41 -0000	1.96
+++ Makefile.common	11 Jan 2005 22:02:05 -0000	1.97
@@ -5,7 +5,7 @@
 ######################################################################
 # The defaul build target: just build the scummvm executable
 ######################################################################
-all: tools $(EXECUTABLE) plugins
+all: $(EXECUTABLE) plugins
 
 
 ######################################################################
@@ -31,7 +31,7 @@
 # Module settings
 ######################################################################
 
-MODULES := base $(MODULES)
+MODULES := tools base $(MODULES)
 
 ifdef DISABLE_SCUMM
 DEFINES += -DDISABLE_SCUMM
@@ -122,7 +122,7 @@
 	$(RM) build.rules config.h config.mak config.log
 
 clean:
-	$(RM) $(OBJS) $(EXECUTABLE) $(TOOLS)
+	$(RM) $(OBJS) $(EXECUTABLE)
 
 .PHONY: all clean dist distclean plugins