Remove mk/autoconf.mk and mk/automake.mk and replace their usage with

USE_TOOLS and any of "autoconf", "autoconf213", "automake" or
"automake14".  Also, we don't need to call the auto* tools via
${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care
to symlink the correct tool to the correct name, so we can just use
aclocal, autoconf, etc.

4 files changed, 2 insertions, 81 deletions

diff --git a/mk/autoconf.mk b/mk/autoconf.mk
deleted file mode 100644
index a0010d2b4e6..00000000000
--- a/mk/autoconf.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: autoconf.mk,v 1.8 2005/05/22 19:11:12 jlam Exp $
-#
-# makefile fragment for packages that use autoconf
-# AUTOCONF_REQD can be set to the minimum version required.
-# It adds a build dependency on the appropriate autoconf package
-# and sets the following variables:
-#	AUTOCONF:	autoconf binary to use
-#	AUTORECONF:	autoreconf binary to use
-#	AUTOHEADER:	autoheader binary to use
-#
-
-.if !defined(AUTOCONF_MK)
-AUTOCONF_MK=	# defined
-
-# minimal required version
-AUTOCONF_REQD?= 2.50
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(AUTOCONF_REQD:M2.1[0-9]*)
-USE_TOOLS+=		autoconf
-.else
-USE_TOOLS+=		autoconf213
-.endif
-
-.endif # AUTOCONF_MK
diff --git a/mk/automake.mk b/mk/automake.mk
deleted file mode 100644
index b08872a521c..00000000000
--- a/mk/automake.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: automake.mk,v 1.10 2005/05/22 19:11:12 jlam Exp $
-#
-# makefile fragment for packages that use automake
-# AUTOMAKE_REQD can be set to the minimum version required.
-# It adds a build dependency on the appropriate automake and autoconf
-# packages and sets the following variables:
-#	AUTOMAKE:	automake binary to use
-#	ACLOCAL:	aclocal binary to use
-# autoconf required version will default to 2.13 if automake 1.4* is used,
-# and to 2.58 otherwise.
-#
-
-.if !defined(AUTOMAKE_MK)
-AUTOMAKE_MK=	# defined
-
-# minimal required version
-AUTOMAKE_REQD?= 1.9
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(AUTOMAKE_REQD:M1.4*)
-USE_TOOLS+=		automake14
-.else
-USE_TOOLS+=		automake
-.endif
-
-.endif # AUTOMAKE_MK
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index 773e0af085e..3bc6c5e4b47 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.9 2005/05/21 04:53:17 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.10 2005/06/01 20:08:01 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -119,13 +119,6 @@ TOOLS_REAL_CMD.autoupdate=	${_TOOLS_AC_PREFIX}/bin/autoupdate
 
 _TOOLS_AC_TYPE.ifnames=		TOOLS_CREATE
 TOOLS_REAL_CMD.ifnames=		${_TOOLS_AC_PREFIX}/bin/ifnames
-
-# Continue to define the following variables until packages have been
-# taught to just use "autoconf", "autoheader", and "autoreconf" instead.
-#
-AUTOCONF=	${TOOLS_CMD.autoconf}
-AUTOHEADER=	${TOOLS_CMD.autoheader}
-AUTORECONF=	${TOOLS_CMD.autoreconf}
 .  endif
 .endif
 
@@ -172,13 +165,6 @@ _TOOLS_AC_TYPE.ifnames=		# empty
 TOOLS_REAL_CMD.ifnames-2.13=	${_TOOLS_AC_PREFIX}/bin/ifnames-2.13
 TOOLS_ALIASES.ifnames-2.13=	ifnames
 
-# Continue to define the following variables until packages have been
-# taught to just use "autoconf", "autoheader", and "autoreconf" instead.
-#
-AUTOCONF=	${TOOLS_CMD.autoconf-2.13}
-AUTOHEADER=	${TOOLS_CMD.autoheader-2.13}
-AUTORECONF=	${TOOLS_CMD.autoreconf-2.13}
-
 .    if defined(USE_LIBTOOL)
 pre-configure: tools-libtool-m4-override
 .    endif
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index d125bbfb045..5b3a5440826 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.12 2005/05/21 04:53:17 jlam Exp $
+# $NetBSD: automake.mk,v 1.13 2005/06/01 20:08:01 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -123,12 +123,6 @@ TOOLS_REAL_CMD.aclocal=		${_TOOLS_AM_PREFIX}/bin/aclocal
 
 _TOOLS_AM_TYPE.automake=	TOOLS_CREATE
 TOOLS_REAL_CMD.automake=	${_TOOLS_AM_PREFIX}/bin/automake
-
-# Continue to define the following variables until packages have been
-# taught to just use "aclocal" and "automake" instead.
-#
-ACLOCAL=	${TOOLS_CMD.aclocal}
-AUTOMAKE=	${TOOLS_CMD.automake}
 .  endif
 .endif
 
@@ -155,12 +149,6 @@ _TOOLS_AM_TYPE.automake-1.4=	TOOLS_CREATE
 _TOOLS_AM_TYPE.automake=	# empty
 TOOLS_REAL_CMD.automake-1.4=	${_TOOLS_AM_PREFIX}/bin/automake-1.4
 TOOLS_ALIASES.automake-1.4=	automake
-
-# Continue to define the following variables until packages have been
-# taught to just use "aclocal" and "automake" instead.
-#
-ACLOCAL=	${TOOLS_CMD.aclocal-1.4}
-AUTOMAKE=	${TOOLS_CMD.automake-1.4}
 .  endif
 .endif