Rework addtargetdir.pl to also fix prefix generated-file depedencies with the target directory, and simplify the sed expression for mkdepfile.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21826 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 23 insertions, 30 deletions

diff --git a/tools/addtargetdir.pl b/tools/addtargetdir.pl
index 2c08d328dc..6a9a72a878 100755
--- a/tools/addtargetdir.pl
+++ b/tools/addtargetdir.pl
@@ -14,30 +14,28 @@ use File::Basename;
 
 my $rbroot = $ARGV[0];
 my $builddir = $ARGV[1];
+undef $/;
 
-my $target2;
+my $target;
+my $rootlen = length $rbroot;
+my $src;
 
-for (<STDIN>) {
-    if (/^([^:]+): (\S+) (.*)/) {
-        my ($target, $src, $rest) = ($1, $2, $3);
-        my $dir = dirname $src;
-        $dir =~ s/^.*$rbroot//;
-        print "$builddir$dir/$target: $src $rest\n";
-    }
-    elsif (/^([^:]+):  \\/) {
-        # target and source on different lines
-        $target2 = $1;
-    }
-    elsif ($target2) {
-        if (/^\s+([^ ]+) (.*)/) {
-            my ($src, $rest) = ($1, $2);
+# Split the input file on any runs of '\' and whitespace.
+for (split(/[\s\\]+/m, <STDIN>)) {
+    /^(\/)?[^:]+(\:)?$/;
+# Save target and continue if this item ends in ':'
+    if (!($2 && ($target=$&))) {
+        $src = $&;
+# If $target is set, prefix it with the target path
+        if ($target) {
             my $dir = dirname $src;
-            $dir =~ s/^.*$rbroot//;
-            print "$builddir$dir/$target2: $src $rest\n";
-            $target2 = "";
+            substr($dir, 0, $rootlen) = $builddir;
+            print "\n$dir/$target";
+            $target = "";
+# Otherwise, check for an incomplete path for the source file
+        } elsif (!$1) {
+            $src = "$builddir/$src";
         }
-    }
-    else {
-        print $_;
+        print " \\\n  $src";
     }
 }
diff --git a/tools/functions.make b/tools/functions.make
index 6748962d6a..66354ebc18 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -28,17 +28,12 @@ preprocess2file = $(shell $(CC) $(PPCFLAGS) $(3) -E -P -x c -include config.h $(
 c2obj = $(addsuffix .o,$(basename $(subst $(ROOTDIR),$(BUILDDIR),$(1))))
 
 # calculate dependencies for a list of source files $(2) and output them
-# to a file $(1)
+# to a file $(1)_, to be later renamed to $(1).
 mkdepfile = $(shell \
         $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h $(2) | \
-        $(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) | \
-        sed -e "s: lang.h: $(BUILDDIR)/lang/lang_core.o:" \
-        -e "s: sysfont.h: $(BUILDDIR)/sysfont.h:" \
-        -e "s: max_language_size.h: $(BUILDDIR)/lang/max_language_size.h:" \
-        -e "s: bitmaps/: $(BUILDDIR)/bitmaps/:g" \
-        -e "s: pluginbitmaps/: $(BUILDDIR)/pluginbitmaps/:g" \
-        -e "s: lib/: $(APPSDIR)/plugins/lib/:g" \
-        -e "s: codeclib.h: $(APPSDIR)/codecs/lib/codeclib.h:g" \
+        sed -e "s: lang.h: lang/lang_core.o:" \
+        -e "s: max_language_size.h: lang/max_language_size.h:" | \
+        $(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) \
         >> $(1)_)
 
 # function to create .bmp dependencies