[ant] 14/17: More debian/rules simplifications

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ant.

commit dfcd7f8ae51b77db390659067c923d8285842c46
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 15:11:28 2017 +0100

    More debian/rules simplifications
---
 debian/rules | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/debian/rules b/debian/rules
index 23ecdd1..d78238f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
 #!/usr/bin/make -f
 
-# hardening
-export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-export AOT_LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-
 DEPENDENCIES := antlr bcel bsf commons-logging javax.mail jdepend junit junit4 hamcrest-core log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch
 
 %:
@@ -12,9 +8,7 @@ DEPENDENCIES := antlr bcel bsf commons-logging javax.mail jdepend junit junit4 h
 override_dh_auto_configure:
 	# Link the dependencies in lib/optional
 	mkdir -p lib/optional
-	for DEPENDENCY in $(DEPENDENCIES); do \
-	    ln -s /usr/share/java/$$DEPENDENCY.jar lib/optional/$$DEPENDENCY.jar; \
-	done
+	for DEPENDENCY in $(DEPENDENCIES); do ln -s /usr/share/java/$$DEPENDENCY.jar lib/optional/$$DEPENDENCY.jar; done
 
 	# Bootstrapping
 	JAVA_HOME=/usr/lib/jvm/default-java ./bootstrap.sh
@@ -32,28 +26,14 @@ override_dh_installdocs:
 override_mh_install:
 	# Override mh_install to install extra links in /usr/share/ant/lib/
 	mh_installpoms -pant
-	mh_installjar -pant          -l src/etc/poms/ant/pom.xml                 build/lib/ant.jar                 /usr/share/ant/lib/ant.jar
-	mh_installjar -pant          -l src/etc/poms/ant-launcher/pom.xml        build/lib/ant-launcher.jar        /usr/share/ant/lib/ant-launcher.jar
+	mh_installjar -pant -l src/etc/poms/ant/pom.xml          build/lib/ant.jar          /usr/share/ant/lib/ant.jar
+	mh_installjar -pant -l src/etc/poms/ant-launcher/pom.xml build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
 
 	mh_installpoms -pant-optional
-	mh_installjar -pant-optional -l src/etc/poms/ant-antlr/pom.xml           build/lib/ant-antlr.jar           /usr/share/ant/lib/ant-antlr.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-bcel/pom.xml     build/lib/ant-apache-bcel.jar     /usr/share/ant/lib/ant-apache-bcel.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-bsf/pom.xml      build/lib/ant-apache-bsf.jar      /usr/share/ant/lib/ant-apache-bsf.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-log4j/pom.xml    build/lib/ant-apache-log4j.jar    /usr/share/ant/lib/ant-apache-log4j.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-oro/pom.xml      build/lib/ant-apache-oro.jar      /usr/share/ant/lib/ant-apache-oro.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-regexp/pom.xml   build/lib/ant-apache-regexp.jar   /usr/share/ant/lib/ant-apache-regexp.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-xalan2/pom.xml   build/lib/ant-apache-xalan2.jar   /usr/share/ant/lib/ant-apache-xalan2.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-commons-net/pom.xml     build/lib/ant-commons-net.jar     /usr/share/ant/lib/ant-commons-net.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-javamail/pom.xml        build/lib/ant-javamail.jar        /usr/share/ant/lib/ant-javamail.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-jdepend/pom.xml         build/lib/ant-jdepend.jar         /usr/share/ant/lib/ant-jdepend.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml             build/lib/ant-jmf.jar             /usr/share/ant/lib/ant-jmf.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml            build/lib/ant-jsch.jar            /usr/share/ant/lib/ant-jsch.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml           build/lib/ant-junit.jar           /usr/share/ant/lib/ant-junit.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml           build/lib/ant-swing.jar           /usr/share/ant/lib/ant-swing.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-testutil/pom.xml        build/lib/ant-testutil.jar        /usr/share/ant/lib/ant-testutil.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-junit4/pom.xml          build/lib/ant-junit4.jar          /usr/share/ant/lib/ant-junit4.jar
+	for MODULE in antlr apache-bcel apache-bsf apache-log4j apache-oro apache-regexp apache-resolver apache-xalan2 \
+	              commons-logging commons-net javamail jdepend jmf jsch junit junit4 swing testutil; do \
+	  mh_installjar -pant-optional -l src/etc/poms/ant-$$MODULE/pom.xml build/lib/ant-$$MODULE.jar /usr/share/ant/lib/ant-$$MODULE.jar; \
+	done
 
 override_dh_install-indep:
 	dh_install -i
@@ -65,6 +45,10 @@ override_dh_install-indep:
 	install -m 755 src/script/antRun  debian/ant/usr/share/ant/bin
 	install -m 755 src/script/*.pl    debian/ant/usr/share/ant/bin
 
+# Hardening
+export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+export AOT_LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 override_dh_link-arch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git