[Box Backup-commit] COMMIT r2232 - box/trunk/infrastructure

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-08-10 22:37:51 +0100 (Sun, 10 Aug 2008)
New Revision: 2232

Modified:
   box/trunk/infrastructure/makebuildenv.pl.in
Log:
Handle multiple-line dependencies in Makefile.extra


Modified: box/trunk/infrastructure/makebuildenv.pl.in
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl.in	2008-08-09 07:09:06 UTC (rev 2231)
+++ box/trunk/infrastructure/makebuildenv.pl.in	2008-08-10 21:37:51 UTC (rev 2232)
@@ -922,11 +922,18 @@
 			chomp;
 			if(m/link-extra:\s*(.+)\Z/)
 			{
-				my @o = split /\s+/,$1;
-				for(@o)
+				my $extra = $1;
+				do
 				{
-					push @$objs_r,$1 if m/\A(.+)\.o\Z/;
+					my @o = split /\s+/, $extra;
+					for(@o)
+					{
+						push @$objs_r,$1 if m/\A(.+)\.o\Z/;
+					}
+					last unless $extra =~ m'\\$';
+					$extra = <FL>;
 				}
+				while(1);
 			}
 			elsif(m/include-makefile:\s*(\S+)/)
 			{