[SCM] gazebo branch, master, updated. upstream/1.6.2-26-g456da84

[Thomas Moulard]

The following commit has been merged in the master branch:
commit 456da84cfb7b0bdac53241f6c4e86ffe1becfa7d
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Sat Jul 13 03:22:26 2013 +0900

    Improve debian/rules

diff --git a/debian/rules b/debian/rules
index 901cee1..13fd732 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,43 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
-
-# Hardening.
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie,+fortify
+# Hardening flags.
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
+# Duplicate flags as CMake is ignoring CPPFLAGS.
 CFLAGS+=$(CPPFLAGS)
 CXXFLAGS+=$(CPPFLAGS)
 
 # Multiarch.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# Configuration flags.
+# Cannot build against player, disable it for now.
+CONFIGURE_ARGS= \
+	-DLIB_INSTALL_DIR=lib/${DEB_HOST_MULTIARCH} \
+	-Dfreeimage_include_dir=/usr/include \
+	-Dfreeimage_library_dir=/usr/lib \
+	-DINCLUDE_PLAYER=OFF
+
 .PHONY: override_dh_auto_configure	\
+	override_dh_auto_build-indep	\
 	override_dh_auto_build		\
 	override_dh_install		\
 	override_dh_strip		\
 	override_dh_auto_test
 
-# Cannot build against player, disable it for now.
 override_dh_auto_configure:
-	dh_auto_configure -- -DLIB_INSTALL_DIR=lib/${DEB_HOST_MULTIARCH} \
-	-Dfreeimage_include_dir=/usr/include -Dfreeimage_library_dir=/usr/lib \
-	-DINCLUDE_PLAYER=OFF
+	dh_auto_configure -- $(CONFIGURE_ARGS)
+
+override_dh_auto_build-indep:
+	dh_auto_build -- doc # Generate Doxygen HTML documentation.
 
 override_dh_auto_build:
 	dh_auto_build -- # Compile the software.
-	dh_auto_build -- doc # Generate Doxygen HTML documentation.
 
 override_dh_install:
 	dh_install -- # Install.

-- 
gazebo