Alexandre Julliard : winetest: Update build scripts for non-recursive makefile.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: feffe620187db331c69591edd151602cc34046dd
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=feffe620187db331c69591ed...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Sep 14 14:12:38 2020 +0200

winetest: Update build scripts for non-recursive makefile.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 transl/parse_resfiles.php | 4 ++--
 winetest/make-winetest    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php
index 23eb191..bdfa063 100644
--- a/transl/parse_resfiles.php
+++ b/transl/parse_resfiles.php
@@ -25,7 +25,7 @@ function create_resfiles($dir, $files)
             continue;
         }
 
-        $targets .= preg_replace("/\.[mr]c$/", ".res", $file). " ";
+        $targets .= "$dir/" . preg_replace("/\.[mr]c$/", ".res", $file). " ";
         $objs .= "$objdir/$dir/" . preg_replace("/\.[mr]c$/", ".res", $file) . " ";
     }
     if ($targets == "")
@@ -35,7 +35,7 @@ function create_resfiles($dir, $files)
 
     $norm_fn = preg_replace("/[^a-zA-Z0-9]/", "-", $dir);
 
-    system("make -C $objdir/$dir -s $targets");
+    system("make -C $objdir -s $targets");
     system("$toolsdir/tools/winebuild/winebuild --resources -o $workdir/res/$norm_fn.res $objs");
 }
 
diff --git a/winetest/make-winetest b/winetest/make-winetest
index a0637b6..13c97c5 100755
--- a/winetest/make-winetest
+++ b/winetest/make-winetest
@@ -79,7 +79,7 @@ umask 022
      cd build64 &&
      ../wine/configure --enable-win64 --with-mingw --without-x --without-freetype) || exit
 
-    (cd build64 && make depend && make __builddeps__) || exit
+    (cd build64 && make depend) || exit
 
     # update the translations status