[Scummvm-cvs-logs] CVS: scummvm Makefile,1.85,1.86 Makefile.common,1.94,1.95

[Max Horn]

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

Modified Files:
	Makefile Makefile.common 
Log Message:
Moving convbdf and md5table into scummvm/tools/

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- Makefile	20 Dec 2004 21:06:08 -0000	1.85
+++ Makefile	24 Dec 2004 01:43:36 -0000	1.86
@@ -83,6 +83,25 @@
 	debian/prepare
 	fakeroot debian/rules binary
 
+#######################################################################
+# Tools directory
+#######################################################################
+
+TOOLS := tools/convbdf$(EXEEXT) tools/md5table$(EXEEXT)
+
+tools: $(TOOLS)
+
+tools/convbdf$(EXEEXT): tools/convbdf.o
+	$(CXX) -o $@ $<
+
+tools/md5table$(EXEEXT): tools/md5table.o
+	$(CXX) -o $@ $<
+
+credits:
+	./credits.pl --text > AUTHORS
+	./credits.pl --html > ../web/credits.inc
+	./credits.pl --cpp > gui/credits.h
+	./credits.pl --xml > ../docs/docbook/credits.xml
 
 #######################################################################
 # Unit/regression tests                                               #
@@ -153,4 +172,4 @@
 	u2d $(WIN32PATH)/*.txt
 
 
-.PHONY: deb bundle test osxsnap win32dist dist install uninstall
+.PHONY: deb bundle test osxsnap win32dist dist install uninstall credits

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- Makefile.common	20 Dec 2004 21:06:08 -0000	1.94
+++ Makefile.common	24 Dec 2004 01:43:36 -0000	1.95
@@ -5,7 +5,7 @@
 ######################################################################
 # The defaul build target: just build the scummvm executable
 ######################################################################
-all: $(EXECUTABLE) plugins
+all: tools $(EXECUTABLE) plugins
 
 
 ######################################################################
@@ -122,7 +122,7 @@
 	$(RM) build.rules config.h config.mak config.log
 
 clean:
-	$(RM) $(OBJS) $(EXECUTABLE)
+	$(RM) $(OBJS) $(EXECUTABLE) $(TOOLS)
 
 .PHONY: all clean dist distclean plugins