The following commit has been merged in the master branch:
commit c0b1e0d6892932f99a52affd8ef4acaab78de865
Author: Ansgar Burchardt <[email protected]>
Date: Thu Nov 3 19:29:49 2011 +0100
debian/rules: Update for new upstream release, enable parallel build.
diff --git a/debian/rules b/debian/rules
index ba79291..c26809e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
#export VERBOSE = 1
export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+export CCFLAGS = $(CFLAGS)
export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
@@ -17,13 +18,14 @@ LDFLAGS += $(HARDENING_LDFLAGS)
build: build-stamp
build-stamp:
- dh build
- $(MAKE) -C makeobj makeobj
+ dh build --parallel
+ $(MAKE) -C makeobj
+ $(MAKE) -C nettools
convert simutrans.ico -alpha on debian/simutrans.xpm
mkdir skin
- ./makeobj/makeobj pak ./skin/ ./skins.src/
+ ./build/default/makeobj/makeobj pak ./skin/ ./skins.src/
touch $@
@@ -34,6 +36,7 @@ clean:
$(MAKE) clean
$(MAKE) -C makeobj clean
+ $(MAKE) -C nettools clean
$(RM) -r skin
dh_clean
@@ -50,7 +53,7 @@ install: build
install -m 644 debian/simutrans.xpm
$(CURDIR)/debian/simutrans/usr/share/pixmaps
install -m 644 debian/simutrans.desktop
$(CURDIR)/debian/simutrans/usr/share/applications
- install sim $(CURDIR)/debian/simutrans/usr/games/simutrans
+ install build/default/sim $(CURDIR)/debian/simutrans/usr/games/simutrans
install -m 644 simutrans/config/simuconf.tab
$(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/config
install -m 644 simutrans/font/*
$(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/font
@@ -65,7 +68,8 @@ install: build
done
rmdir --ignore-fail-on-non-empty
$(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/text/zh
- install -m 755 makeobj/makeobj
$(CURDIR)/debian/simutrans-makeobj/usr/games/makeobj
+ install -m 755 build/default/makeobj/makeobj
$(CURDIR)/debian/simutrans-makeobj/usr/games/makeobj
+ install -m 755 build/default/nettool/nettool
$(CURDIR)/debian/simutrans/usr/games/simutrans-nettool
override_dh_builddeb:
dh_builddeb -- -Zxz
--
transportation simulator
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
