From patchwork Tue Aug 28 06:47:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Add dh-autoreconf support and clean up generated files (LP: #1042287) Date: Mon, 27 Aug 2012 20:47:17 -0000 From: Keng-Yu Lin X-Patchwork-Id: 180341 Message-Id: <1346136437-29365-1-git-send-email-kengyu@canonical.com> To: fwts-devel@lists.ubuntu.com dh-autoreconf/dh_autoreconf_clean can handle the clean-up job if it is used. dh-autoreconf package is available in Lucid-backports and any newer Ubuntu release. The patch also cleans up some output files generated by flex. Signed-off-by: Keng-Yu Lin Acked-by: Colin Ian King Acked-by: Chris Van Hoof --- debian/control | 2 +- debian/rules | 6 ++---- src/acpica/Makefile.am | 10 +++++++++- 3 files changed, 12 insertions(+), 6 deletions(-) We can configure the PPA to support -backports. diff --git a/debian/control b/debian/control index cd7e199..d8a62bb 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Firmware Testing Team Uploaders: Colin King , Keng-Yu Lin , Alex Hung , Chris Van Hoof , Ivan Hu Standards-Version: 3.9.3 -Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libpcre3-dev (>= 7.8), libjson0-dev (>= 0.9), flex, bison +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libpcre3-dev (>= 7.8), libjson0-dev (>= 0.9), flex, bison, hardening-wrapper, dh-autoreconf Package: fwts Architecture: any diff --git a/debian/rules b/debian/rules index 0f317e6..bc81959 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,6 @@ #!/usr/bin/make -f -override_dh_auto_configure: - autoreconf -ivf - dh_auto_configure +export DEB_BUILD_HARDENING=1 %: - dh $@ + dh $@ --with autoreconf diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am index 6b3bfa5..46d801f 100644 --- a/src/acpica/Makefile.am +++ b/src/acpica/Makefile.am @@ -40,7 +40,15 @@ dscontrol_munged.c: $(ACPICA_COMP)/dispatcher/dscontrol.c BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c -CLEANFILES = osunixxf_munged.c +CLEANFILES = osunixxf_munged.c \ + dscontrol_munged.c \ + $(ACPICA_SRC)/compiler/aslcompiler.output \ + $(ACPICA_SRC)/compiler/dtparser.output \ + $(ACPICA_SRC)/compiler/dtparser.y.h \ + $(ACPICA_SRC)/compiler/prparser.output \ + $(ACPICA_SRC)/compiler/prparser.y.h \ + $(ACPICA_SRC)/compiler/prparserlex.c \ + $(ACPICA_SRC)/compiler/prparserparse.c pkglib_LTLIBRARIES = libfwtsacpica.la libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0