diff options
author | Alexandre Duret-Lutz <adl@gnu.org> | 2002-04-13 21:26:36 +0000 |
---|---|---|
committer | Alexandre Duret-Lutz <adl@gnu.org> | 2002-04-13 21:26:36 +0000 |
commit | c9c536afe3a3e05524731d111634952148678af1 (patch) | |
tree | c5115ce21ab5ce5cdb711d9270b54dc38567bed0 /lib/am/header-vars.am | |
parent | cc811fde2ac4eb456841070e9a522978fee18ffe (diff) | |
download | automake-c9c536afe3a3e05524731d111634952148678af1.tar.gz |
Enable traces; wipe out the old configure.in parser.
* automake.in (scan_autoconf_traces): Use '$ENF{AUTOCONF}' of
'autoconf'. Honnor the $filename argument.
(scan_autoconf_files): Don't call scan_one_autoconf_file.
Always call scan_autoconf_traces.
(scan_one_autoconf_file): Remove, with it associated regexes.
(obsolete, obsolete_rx): Remove.
(register_language, handle_languages): Remove the 'define_flag'
support. Remove it from the struct and language definitions too.
(unquote_m4_arg): Remove.
* lib/am/header-vars.am, lib/am/compile.am, lib/am/lisp.am: Remove
the `FOO = @FOO@' definitions for all AC_SUBST'ed variables. They
are now generated automatically.
* aclocal.in (obsolete_macros): Don't mention obsolete_macros in
automake.in.
* automake.texi (Invoking Automake): Mention the AUTOCONF envvar.
Diffstat (limited to 'lib/am/header-vars.am')
-rw-r--r-- | lib/am/header-vars.am | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index b389d36c5..f646f898b 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -16,26 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include @SET_MAKE@ @@ -55,20 +39,11 @@ pkgincludedir = $(includedir)/@PACKAGE@ ## Location of top build directory relative to this one. top_builddir = %TOPDIR% -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ ## These are defined because otherwise make on NetBSD V1.1 will print ## (eg): $(NORMAL_INSTALL) expands to empty string. @@ -78,18 +53,3 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -## FIXME: Why the heck are _triplet variables not defined from the -## _triplet values? -## FIXME: this should probably use generic %configure_vars method. -## Let's wait until we rely upon traces. -?BUILD?build_alias = @build_alias@ -?BUILD?build_triplet = @build@ -?HOST?host_alias = @host_alias@ -?HOST?host_triplet = @host@ -?TARGET?target_alias = @target_alias@ -?TARGET?target_triplet = @target@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ |