fix dlltool target directory dependencies

[reactos.git] / reactos / tools / rbuild / backend / mingw / modulehandler.cpp

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 1989fb3..e49a9c1 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -1109,9 +1109,10 @@ MingwModuleHandler::GenerateArchiveTarget ( const Module& module,
        string archiveFilename = GetModuleArchiveFilename ( module );\r
        \r
        fprintf ( fMakefile,\r
-                 "%s: %s\n",\r
+                 "%s: %s %s\n",\r
                  archiveFilename.c_str (),\r
-                 objs_macro.c_str ());\r
+                 objs_macro.c_str (),\r
+                 GetDirectory(archiveFilename).c_str() );\r
 \r
        fprintf ( fMakefile, "\t$(ECHO_AR)\n" );\r
 \r
@@ -1213,7 +1214,9 @@ MingwModuleHandler::GenerateMacrosAndTargets (
        nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ());\r
        objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ());\r
 \r
-       string ar_target = GenerateArchiveTarget ( module, ar, objectsMacro );\r
+       string ar_target =\r
+               GenerateArchiveTarget ( module, ar, objectsMacro );\r
+\r
        GenerateObjectFileTargets ( module,\r
                                    cc,\r
                                    cppc,\r
@@ -1366,8 +1369,8 @@ MingwModuleHandler::GenerateImportLibraryTargetIfNeeded (
                string definitionDependencies = GetDefinitionDependencies ( module );\r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          library_target.c_str (),\r
-                         library_target.c_str (),\r
-                         definitionDependencies.c_str () );\r
+                         definitionDependencies.c_str (),\r
+                         GetDirectory(library_target).c_str () );\r
 \r
                fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );\r
 \r