[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: FYI: PR 243
From: |
Tom Tromey |
Subject: |
Patch: FYI: PR 243 |
Date: |
30 Dec 2001 13:39:18 -0700 |
I'm checking this in.
This adds a test case and a fix for PR 243.
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
For PR automake/243:
* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Strip everything
after `:'.
* tests/Makefile.am (TESTS): Added pr243.test.
* tests/pr243.test: New file.
Index: m4/depout.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depout.m4,v
retrieving revision 1.9
diff -u -r1.9 depout.m4
--- m4/depout.m4 2001/12/30 00:19:42 1.9
+++ m4/depout.m4 2001/12/30 20:27:32
@@ -23,6 +23,8 @@
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
if (head -1 $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.360
diff -u -r1.360 Makefile.am
--- tests/Makefile.am 2001/12/30 20:07:36 1.360
+++ tests/Makefile.am 2001/12/30 20:27:32
@@ -240,6 +240,7 @@
ppf77.test \
pr2.test \
pr220.test \
+pr243.test \
pr266.test \
pr279.test \
pr279-2.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.467
diff -u -r1.467 Makefile.in
--- tests/Makefile.in 2001/12/30 20:07:36 1.467
+++ tests/Makefile.in 2001/12/30 20:27:32
@@ -313,6 +313,7 @@
ppf77.test \
pr2.test \
pr220.test \
+pr243.test \
pr266.test \
pr279.test \
pr279-2.test \
Index: tests/pr243.test
===================================================================
RCS file: pr243.test
diff -N pr243.test
--- /dev/null Tue May 5 13:32:27 1998
+++ tests/pr243.test Sun Dec 30 12:27:32 2001
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+# Test for PR 243.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(foo, 0.1, address@hidden)
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_PROG_CC
+AM_CONDITIONAL(FOOTEST, false)
+AC_CONFIG_FILES(Makefile:Makefile.in:tail.mk)
+AC_OUTPUT
+END
+
+: > tail.mk
+
+cat > Makefile.am << 'END'
+include_HEADERS = 3dfx.h linutil.h
+noinst_HEADERS = fx64.h fxdll.h fximg.h fxglob.h \
+ fxos.h fxver.h glob.h
+noinst_PROGRAMS = fxmisc
+fxmisc_SOURCES = fx64.c fximg.c fxos.c linutil.c
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1
+$AUTOCONF || exit 1
+./configure || exit 1
+
+test -f .deps/fx64.Po
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch: FYI: PR 243,
Tom Tromey <=