automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: no .deps directory generated


From: Ralf Wildenhues
Subject: Re: no .deps directory generated
Date: Fri, 30 Mar 2007 00:39:58 +0200
User-agent: Mutt/1.5.13 (2006-08-11)

* Ralf Wildenhues wrote on Mon, Jan 08, 2007 at 08:46:06PM CET:
> > > * David Byron wrote on Mon, Jan 08, 2007 at 07:40:02PM CET:
> [...]
> > > > 
> > > > AC_CONFIG_FILES([Makefile util/Makefile
> > > > util/tests/Makefile:config/cppunit.mk.in:util/tests/Makefile.in
> > > > testmain/Makefile])

> Darn, this looks like a regression of 1.10 over 1.9.6, due to the
>   sed 10q
> 
> in m4/depout.m4: because cppunit.mk is longer than 10 lines, it won't
> get to the "generated by automake" line any more.

I've applied this patch to HEAD and branch-1-10 now, and added David to
THANKS.

Cheers,
Ralf

        * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search
        the whole file, but use sed to reduce the line length.
        Fixes 1.10 regression.  Report by David Byron.
        * THANKS, NEWS: Update.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.324
diff -u -r1.324 NEWS
--- NEWS        28 Mar 2007 23:08:05 -0000      1.324
+++ NEWS        29 Mar 2007 22:39:30 -0000
@@ -20,6 +20,11 @@
 * Long standing bugs:
 
   - Fix aix dependency tracking for libtool objects.
+
+* Bugs introduced by 1.10:
+
+  - Fix output of dummy dependency files in presence of post-processed
+    Makefile.in's again, but also cope with long lines.
 
 New in 1.10:
 
Index: m4/depout.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depout.m4,v
retrieving revision 1.19
diff -u -r1.19 depout.m4
--- m4/depout.m4        6 Jun 2006 20:39:22 -0000       1.19
+++ m4/depout.m4        29 Mar 2007 22:39:31 -0000
@@ -22,7 +22,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 
2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue




reply via email to

[Prev in Thread] Current Thread [Next in Thread]