+Sun Aug 16 23:26:26 1998 Tom Tromey <tromey@cygnus.com>
+
+ * automake.in (handle_configure): Use @inputs, not
+ @rewritten_inputs, when constructing CONFIG_FILES. Use different
+ list to test for file existence. Test colon6.test.
+ (rewrite_inputs_into_dependencies): Added add_srcdir argument.
+ Updated all callers.
+
Wed Aug 12 14:16:57 1998 Tom Tromey <tromey@cygnus.com>
* Released 1.3b.
Mark Galassi rosalia@nis.lanl.gov
Markku Rossi mtr@ngs.fi
Markus F.X.J. Oberhumer k3040e4@wildsau.idv-edu.uni-linz.ac.at
+Matt Leach mleach@cygnus.com
Michael Brantley Michael-Brantley@deshaw.com
Motoyuki Kasahara m-kasahr@sra.co.jp
Nelson H. F. Beebe beebe@math.utah.edu
* Reimplement maintainer mode to use conditionals
Also add a conditional for dependency tracking
+* Allow per-object cflags:
+ bin_PROGRAMS = foo
+ foo_CFLAGS = -DFOO
+
* Allow for multiple translations of a texinfo file:
LL_info_TEXINFOS = ...
will put info files for language LL into $(infodir)/LL.
# AC_OUTPUT. Consider what the dependencies should look like in this
# case:
# AC_OUTPUT(src/out:src/in1:lib/in2)
+# The first argument, ADD_SRCDIR, is 1 if $(top_srcdir) should be added.
+# If 0 then files that require this addition will simply be ignored.
sub rewrite_inputs_into_dependencies
{
- local (@inputs) = @_;
+ local ($add_srcdir, @inputs) = @_;
local ($single, @newinputs);
foreach $single (@inputs)
{
push (@newinputs, &basename ($single));
}
- else
+ elsif ($add_srcdir)
{
push (@newinputs, '$(top_srcdir)/' . $single);
}
$colon_infile .= ':' . join (':', @secondary_inputs)
if @secondary_inputs;
- local (@rewritten) = &rewrite_inputs_into_dependencies (@secondary_inputs);
+ local (@rewritten) = &rewrite_inputs_into_dependencies (1,
+ @secondary_inputs);
# This rule remakes the Makefile.in. Note use of @MAINT@ forces
# us to abandon pretty-printing. Sigh.
$output_rules .= ($infile
$file = $1;
$local = &basename ($file);
@inputs = split (':', $2);
- @rewritten_inputs = &rewrite_inputs_into_dependencies (@inputs);
+ @rewritten_inputs = &rewrite_inputs_into_dependencies (1, @inputs);
$need_rewritten = 1;
}
else
$local = &basename ($file);
@inputs = ($local . '.in');
@rewritten_inputs =
- &rewrite_inputs_into_dependencies ($file . '.in');
+ &rewrite_inputs_into_dependencies (1, $file . '.in');
$need_rewritten = 0;
}
. 'cd $(top_builddir) && CONFIG_FILES='
. ($relative_dir eq '.' ? '' : '$(subdir)/')
. '$@' . ($need_rewritten
- ? (':' . join (':', @rewritten_inputs))
+ ? (':' . join (':', @inputs))
: '')
. ' CONFIG_HEADERS= $(SHELL) ./config.status'
. "\n");
# Require all input files.
&require_file_with_conf_line ($ac_output_line, $FOREIGN,
- @inputs);
+ &rewrite_inputs_into_dependencies (0, @inputs));
}
# These files get removed by "make clean".
+Sun Aug 16 23:17:38 1998 Tom Tromey <tromey@cygnus.com>
+
+ * colon6.test: New file.
+
+Fri Aug 14 11:09:03 1998 Tom Tromey <tromey@cygnus.com>
+
+ * cond6.test: New file.
+
Mon Aug 10 21:05:15 1998 Tom Tromey <tromey@cygnus.com>
* ansi3.test: New file.
java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
lex2.test libobj8.test version3.test instdata.test exdir2.test \
colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
-ansi3.test
+ansi3.test cond6.test colon6.test
EXTRA_DIST = defs $(TESTS)
java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
lex2.test libobj8.test version3.test instdata.test exdir2.test \
colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
-ansi3.test
+ansi3.test cond6.test colon6.test
EXTRA_DIST = defs $(TESTS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- /dev/null
+#! /bin/sh
+
+# Yet another multi-":" test, this time from Ken Pizzini.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(demo/Makefile demo/version.good:demo/version.gin)
+END
+
+mkdir demo
+
+: > demo/Makefile.am
+: > demo/version.gin
+
+$AUTOMAKE
--- /dev/null
+#! /bin/sh
+
+# Test for an odd conditional bug. Report from Matt Leach.
+
+. $srcdir/defs || exit 1
+
+echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
+
+cat > Makefile.am << 'END'
+
+if FOO
+
+helpdir = $(prefix)/Help
+# The continuation line below must start with a Tab to see the bug.
+help_DATA = a b c d e \
+ f g h
+
+else
+
+helpdir = $(prefix)/help
+help_DATA = foo
+
+endif
+END
+
+$AUTOMAKE