* automake.in (&initialize_per_input): %targets_conditionals is

new.
(&read_am_file): When slurping a rule, set the target related
variable, and no variable related variable.
(&file_contents): Likewise.
* tests/vartar.test, tests/ctarget1.test: New.

diff --git a/ChangeLog b/ChangeLog
index c6baa6848665c88e806a39e6731a10d406844aad..b0df21d9c4750148e381ca4f5ba64f86c5a98dda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,6 @@
        (&file_contents): Likewise.
        * tests/vartar.test, tests/ctarget1.test: New.
 
-       
 2001-02-25  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&variable_defined, &variable_value_as_list_worker):

diff --git a/tests/ctarget1.test b/tests/ctarget1.test
new file mode 100755 (executable)
index 0000000..0867712
--- /dev/null
+++ b/tests/ctarget1.test
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+# Check basic use of conditionals.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AM_CONDITIONAL(TEST, true)
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+if TEST
+target: true
+    action
+else
+target: false
+endif
+END
+
+set -e
+
+$AUTOMAKE
+grep '^@TEST_TRUE@target: true' Makefile.in
+grep '^@TEST_TRUE@     action' Makefile.in
+grep '^@TEST_FALSE@target: false' Makefile.in
+exit 0

diff --git a/tests/vartar.test b/tests/vartar.test
new file mode 100755 (executable)
index 0000000..817ae72
--- /dev/null
+++ b/tests/vartar.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Targets and macros are two different name spaces.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+INSTALL = INSTALL
+INSTALL:
+       $(INSTALL) INSTALL
+END
+
+$AUTOMAKE || exit 1
+
+grep '^INSTALL = INSTALL$' Makefile.in || exit 1
+
+cat > target.expected <<'EOF'
+INSTALL:
+       $(INSTALL) INSTALL
+EOF
+sed -n '/^INSTALL:/,/^ /p' Makefile.in > target.value
+diff target.expected target.value || exit 1
+
+exit 0