[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-78-ga0cfade

[Anton Gladky]

The following commit has been merged in the master branch:
commit 3a76893b9f0f7217da68e66fb01013cc4088b7ff
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Jun 10 21:52:38 2011 +0200

    Add CXXFLAGS from dpkg-buildflag.

diff --git a/debian/rules b/debian/rules
index 769b9fc..ebb55a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ tmpInstall = $(CURDIR)/debian/inst
 tmpInstallDbg = $(CURDIR)/debian/inst-dbg
 export VERSION=$(shell cat VERSION)
 export _VERSION=-${VERSION}
+CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
 
 %:
 	dh $@
@@ -33,7 +34,7 @@ override_dh_auto_build:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
+	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
 	#optimized build
 	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=${tmpInstall} variant=''  -j1 optimize=1 debug=0
 	# generate manpages

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.