diff options
| author | Akim Demaille <akim@epita.fr> | 2001-04-09 09:03:11 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2001-04-09 09:03:11 +0000 |
| commit | fc0250b311d6e0374d82ac7521576730a4682171 (patch) | |
| tree | f9a30d01e372e268dc576eab0cab75dcfc6222ae | |
| parent | e1c3eb5a9edce4b0abbe7edc09aa56496ad59bdb (diff) | |
| download | automake-fc0250b311d6e0374d82ac7521576730a4682171.tar.gz | |
* depend2.am (@AMDEP@%FPFX%DEPMODE): Define it when GENERIC so
that it does not get noticed twice by automake, which now
complains for multiple definitions.
* tests/vartar.test: s/INSTALL/install/g, automake now complains
because we defined INSTALL.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | depend2.am | 2 | ||||
| -rw-r--r-- | lib/am/depend2.am | 2 | ||||
| -rwxr-xr-x | tests/vartar.test | 14 |
4 files changed, 18 insertions, 9 deletions
@@ -1,5 +1,14 @@ 2001-04-09 Akim Demaille <akim@epita.fr> + * depend2.am (@AMDEP@%FPFX%DEPMODE): Define it when GENERIC so + that it does not get noticed twice by automake, which now + complains for multiple definitions. + * tests/vartar.test: s/INSTALL/install/g, automake now complains + because we defined INSTALL. + + +2001-04-09 Akim Demaille <akim@epita.fr> + * automake.in (&generate_makefile) Use macro_define to define SOURCES and OBJECTS. (&variable_defined): Don't check for $conditional{VAR}{COND} as diff --git a/depend2.am b/depend2.am index e61e28f3d..285adf609 100644 --- a/depend2.am +++ b/depend2.am @@ -21,7 +21,7 @@ ## - once per language for generic compilation rules ## - once for each file which requires specific flags. -?AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@ +?GENERIC??AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@ ?GENERIC?%EXT%.o: ?!GENERIC?%OBJ%: %SOURCE% diff --git a/lib/am/depend2.am b/lib/am/depend2.am index e61e28f3d..285adf609 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -21,7 +21,7 @@ ## - once per language for generic compilation rules ## - once for each file which requires specific flags. -?AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@ +?GENERIC??AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@ ?GENERIC?%EXT%.o: ?!GENERIC?%OBJ%: %SOURCE% diff --git a/tests/vartar.test b/tests/vartar.test index 817ae7295..578dbd046 100755 --- a/tests/vartar.test +++ b/tests/vartar.test @@ -5,20 +5,20 @@ . $srcdir/defs || exit 1 cat > Makefile.am << 'END' -INSTALL = INSTALL -INSTALL: - $(INSTALL) INSTALL +install = install +install: + $(install) install END $AUTOMAKE || exit 1 -grep '^INSTALL = INSTALL$' Makefile.in || exit 1 +grep '^install = install$' Makefile.in || exit 1 cat > target.expected <<'EOF' -INSTALL: - $(INSTALL) INSTALL +install: + $(install) install EOF -sed -n '/^INSTALL:/,/^ /p' Makefile.in > target.value +sed -n '/^install:/,/^ /p' Makefile.in > target.value diff target.expected target.value || exit 1 exit 0 |