[SCM] transportation simulator branch, master, updated. debian/102.2.2.ds1-1-21-g99a3ce9

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 98ef4ced5576bab0eb07040f6c0653410e8e890c
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Wed Feb 16 23:12:35 2011 +0100

    Adjust debian/rules for building makeobj.

diff --git a/debian/rules b/debian/rules
index 708666e..603e8fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,9 @@
 build: build-stamp
 build-stamp:
 	dh build
-	convert simutrans.ico -alpha on debian/simutrans.xpm
+	$(MAKE) -C makeobj makeobj
 
-	# we have to remove the object files before, as there are
-	# code sections that behave differently when compiled
-	# for makeobj
-	$(MAKE) -C makeobj clean
-	$(MAKE) makeobj_prog
+	convert simutrans.ico -alpha on debian/simutrans.xpm
 
 	mkdir skin
 	./makeobj/makeobj pak ./skin/ ./skins.src/

-- 
transportation simulator