From b65ffb88bd166df3eac2441a153f1644d5944d6a Mon Sep 17 00:00:00 2001 From: "Theodore A. Roth" Date: Thu, 6 Mar 2003 06:45:54 +0000 Subject: [PATCH] * configure.ac: Remove hack to make work with automake-1.5. * doc/Makefile.am: Remove extra rules that were needed to work with automake-1.5. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@265 81a1dc3b-b13d-400b-aceb-764788c761c2 --- configure.ac | 13 +++---------- doc/Makefile.am | 12 ++++++------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 8e73e0b7..28cca8b6 100644 --- a/configure.ac +++ b/configure.ac @@ -23,22 +23,15 @@ # Process this file with autoconf to produce a configure script. -# Automake-1.5 requires arguments to AM_INIT_AUTOMAKE, but Automake-1.6 and -# later to not. To work around this, we need to give the version in two places -# so we define avrdude_version. Once freebsd can use 1.6 or newer, we can get -# rid of this silly hack and remove the args to AM_INIT_AUTOMAKE. - -m4_define([avrdude_version],[3.1.0cvs]) - -AC_PREREQ(2.53) -AC_INIT(avrdude, avrdude_version, avrdude-dev@nongnu.org) +AC_PREREQ(2.57) +AC_INIT(avrdude, 3.1.0cvs, avrdude-dev@nongnu.org) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET AC_CONFIG_SRCDIR([main.c]) -AM_INIT_AUTOMAKE(avrdude, avrdude_version) +AM_INIT_AUTOMAKE AM_CONFIG_HEADER([ac_cfg.h]) # Checks for programs. diff --git a/doc/Makefile.am b/doc/Makefile.am index aec7ffb9..ff2a887c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -31,18 +31,18 @@ html: mv *.html avrdude-html # This rule is only need for automake versions prior to 1.7 -ps: avrdude.ps +#ps: avrdude.ps # The pdf rules are only needed for automake versions prior to 1.7 -pdf: avrdude.pdf +#pdf: avrdude.pdf -avrdude.pdf: $(info_TEXINFOS) +#avrdude.pdf: $(info_TEXINFOS) -SUFFIXES = .pdf +#SUFFIXES = .pdf -.texi.pdf: - texi2pdf $? +#.texi.pdf: +# texi2pdf $? clean-local: rm -rf avrdude-html *.info