Merge branch 'master' into lpcm_encoder

[vlc] / extras / buildsystem / make.pl

diff --git a/extras/buildsystem/make.pl b/extras/buildsystem/make.pl
index 47e4200a9fdce650a183a30d60a0cd6cd2736b97..348c6e0833c41d79c82dc203d4666b498de8d956 100755 (executable)
--- a/extras/buildsystem/make.pl
+++ b/extras/buildsystem/make.pl
@@ -23,8 +23,7 @@ while(<STDIN>)
      $line = $_;
      chomp $line;
      # Skip entering/leaving directories and incomplete lines
-     if(
-       $line =~ /make\[([0-9]*)\]:.*/ ||
+     if($line =~ /make\[([0-9]*)\]:.*/ ||
 #       $line =~ /.*\s\\$/ ||
         $line =~ /^test\s\-z\s/ ||
         $line =~ /^Making\sclean\sin\s\./ ||
@@ -45,16 +44,18 @@ while(<STDIN>)
        $line =~ /^rm\s-fr\s(.*)/ ||
        $line =~ /^mv\s-f\s(.*)/ ||
        $line =~ /^ln\s-s\s(.*)/ ||
-       $line =~ /^echo\s/ ||
+       $line =~ /^\s*echo\s/ ||
        $line =~ /^mkdir\s/ ||
-       $line =~ /^cat\s/ ||
+       $line =~ /^\s*cat\s/ ||
        $line =~ /^grep\s/ ||
        $line =~ /^cd\s/ ||
        $line =~ /^sed\s/ ||
        $line =~ /^bindir=\s/ ||
        $line =~ /^libtool:\s/ ||
-       $line =~ /^creating lib.*/ ||
-        $line =~ /^\s*\// )
+       $line =~ /^\/bin\/sh/ ||
+       $line =~ /^\/usr\/bin\/moc-qt4/ ||
+       $line =~ /^\/usr\/bin\/uic-qt4/ ||
+       $line =~ /^creating lib.*/)
      {}
      # Info
      elsif(