From 0a11922d303fd443f6306b3fc23fa71117257fb3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 14 Feb 2006 16:20:46 +0000 Subject: update packaging git-svn-id: file:///home/lennart/svn/public/keyfuzz/trunk@12 e03e4fad-c0d1-0310-aabf-8987f8117c4c --- Makefile.am | 8 ++------ bootstrap.sh | 14 ++++++++------ configure.ac | 4 ++-- doc/Makefile.am | 2 +- doc/README.html.in | 24 ++++++++++++++++-------- doc/style.css | 15 ++++----------- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9560ab5..6a503c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,11 +30,7 @@ README: homepage: test -d $$HOME/homepage/lennart mkdir -p $$HOME/homepage/lennart/projects/keyfuzz - cp *.tar.gz $$HOME/homepage/lennart/projects/keyfuzz - cp man/keyfuzz.8.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/style.css doc/README.html $$HOME/homepage/lennart/projects/keyfuzz - cp $$HOME/homepage/lennart/projects/keyfuzz/README.html $$HOME/homepage/lennart/projects/keyfuzz/index.html - -distcleancheck: - @: + cp keyfuzz-@PACKAGE_VERSION@.tar.gz man/keyfuzz.8.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/style.css doc/README.html $$HOME/homepage/lennart/projects/keyfuzz + ln -sf README.html $$HOME/homepage/lennart/projects/keyfuzz/index.html .PHONY: homepage distcleancheck diff --git a/bootstrap.sh b/bootstrap.sh index 7eb124b..bf46ece 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,6 +17,8 @@ # along with keyfuzz; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +VERSION="1.9" + run_versioned() { local P type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1" @@ -24,22 +26,22 @@ run_versioned() { shift 2 "$P" "$@" } + +set -ex if [ "x$1" = "xam" ] ; then - set -ex - run_versioned automake 1.7 -a -c + run_versioned automake "$VERSION" -a -c --foreign ./config.status else - set -ex rm -rf autom4te.cache rm -f config.cache - run_versioned aclocal 1.7 + run_versioned aclocal "$VERSION" autoheader - run_versioned automake 1.7 -a -c + run_versioned automake "$VERSION" -a -c --foreign autoconf -Wall - ./configure --sysconfdir=/etc "$@" + CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc "$@" make clean fi diff --git a/configure.ac b/configure.ac index 9348d98..1d9d228 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PREREQ(2.59) AC_INIT([keyfuzz],[0.2],[mzxrlshmm (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/keyfuzz.c]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign -Wall]) +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/keyfuzz/]) @@ -39,7 +39,7 @@ AC_PROG_MAKE_SET # If using GCC specifiy some additional parameters if test "x$GCC" = "xyes" ; then - CFLAGS="$CFLAGS -pipe -Wall" + CFLAGS="$CFLAGS -pipe -Wall -W -pedantic" fi # Checks for header files. diff --git a/doc/Makefile.am b/doc/Makefile.am index cd2c0e9..7ec8318 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -30,7 +30,7 @@ CLEANFILES += README endif tidy: README.html - tidy -e < README.html + tidy -qe < README.html ; true .PHONY: tidy diff --git a/doc/README.html.in b/doc/README.html.in index 6795046..2f4da8b 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,7 +10,7 @@

keyfuzz @PACKAGE_VERSION@

-

Copyright 2004 Lennart Poettering <@PACKAGE_BUGREPORT@>

+

Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@>