* 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
This commit is contained in:
parent
c8cb63a1a8
commit
b65ffb88bd
13
configure.ac
13
configure.ac
|
@ -23,22 +23,15 @@
|
||||||
|
|
||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
# Automake-1.5 requires arguments to AM_INIT_AUTOMAKE, but Automake-1.6 and
|
AC_PREREQ(2.57)
|
||||||
# later to not. To work around this, we need to give the version in two places
|
AC_INIT(avrdude, 3.1.0cvs, avrdude-dev@nongnu.org)
|
||||||
# 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_CANONICAL_BUILD
|
AC_CANONICAL_BUILD
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
AC_CANONICAL_TARGET
|
AC_CANONICAL_TARGET
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR([main.c])
|
AC_CONFIG_SRCDIR([main.c])
|
||||||
AM_INIT_AUTOMAKE(avrdude, avrdude_version)
|
AM_INIT_AUTOMAKE
|
||||||
AM_CONFIG_HEADER([ac_cfg.h])
|
AM_CONFIG_HEADER([ac_cfg.h])
|
||||||
|
|
||||||
# Checks for programs.
|
# Checks for programs.
|
||||||
|
|
|
@ -31,18 +31,18 @@ html:
|
||||||
mv *.html avrdude-html
|
mv *.html avrdude-html
|
||||||
|
|
||||||
# This rule is only need for automake versions prior to 1.7
|
# 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
|
# 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:
|
#.texi.pdf:
|
||||||
texi2pdf $?
|
# texi2pdf $?
|
||||||
|
|
||||||
clean-local:
|
clean-local:
|
||||||
rm -rf avrdude-html *.info
|
rm -rf avrdude-html *.info
|
||||||
|
|
Loading…
Reference in New Issue