more *nix compatibility fixes

svn path=/branches/xmlbuildsystem/; revision=13956

diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak
index 7a5da94..7168f48 100644 (file)
--- a/reactos/tools/buildno/buildno.mak
+++ b/reactos/tools/buildno/buildno.mak
@@ -1,7 +1,7 @@
-BUILDNO_BASE = tools$(SEP)buildno
+BUILDNO_BASE = .$(SEP)tools$(SEP)buildno
 
 BUILDNO_TARGET = \
-       $(EXEPREFIX)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
+       $(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
 
 BUILDNO_SOURCES = \
        $(BUILDNO_BASE)$(SEP)buildno.cpp \

diff --git a/reactos/tools/cdmake/cdmake.mak b/reactos/tools/cdmake/cdmake.mak
index 1a38ba8..4b405fc 100644 (file)
--- a/reactos/tools/cdmake/cdmake.mak
+++ b/reactos/tools/cdmake/cdmake.mak
@@ -1,4 +1,4 @@
-CDMAKE_BASE = tools$(SEP)cdmake
+CDMAKE_BASE = .$(SEP)tools$(SEP)cdmake
 
 CDMAKE_TARGET = \
        $(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX)

diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak
index 9b4d21f..1298e0b 100644 (file)
--- a/reactos/tools/nci/nci.mak
+++ b/reactos/tools/nci/nci.mak
@@ -1,4 +1,4 @@
-NCI_BASE = tools$(SEP)nci
+NCI_BASE = .$(SEP)tools$(SEP)nci
 
 NCI_TARGET = \
        $(ROS_INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX)

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index a9d6f08..db97808 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -809,7 +809,7 @@ MingwModuleHandler::GenerateWindresCommand ( const Module& module,
        string resFilename = ReplaceExtension ( sourceFilename,\r
                                                ".res" );\r
        fprintf ( fMakefile,\r
-                 "%s: %s\n",\r
+                 "%s: %s $(WRC_TARGET)\n",\r
                  objectFilename.c_str (),\r
                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );\r
@@ -820,7 +820,7 @@ MingwModuleHandler::GenerateWindresCommand ( const Module& module,
                 rciFilename.c_str () );\r
        fprintf ( fMakefile,\r
                 "\t${wrc} ${%s} %s %s\n",\r
-           windresflagsMacro.c_str (),\r
+                windresflagsMacro.c_str (),\r
                 rciFilename.c_str (),\r
                 resFilename.c_str () );\r
        fprintf ( fMakefile,\r

diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak
index 59d0425..d7534e5 100644 (file)
--- a/reactos/tools/rbuild/rbuild.mak
+++ b/reactos/tools/rbuild/rbuild.mak
@@ -1,4 +1,4 @@
-RBUILD_BASE = tools$(SEP)rbuild\r
+RBUILD_BASE = .$(SEP)tools$(SEP)rbuild\r
 \r
 RBUILD_TARGET = \\r
        $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild$(EXEPOSTFIX)\r

diff --git a/reactos/tools/unicode/unicode.mak b/reactos/tools/unicode/unicode.mak
index 401d973..cf400d5 100644 (file)
--- a/reactos/tools/unicode/unicode.mak
+++ b/reactos/tools/unicode/unicode.mak
@@ -1,4 +1,4 @@
-UNICODE_BASE = tools$(SEP)unicode
+UNICODE_BASE = .$(SEP)tools$(SEP)unicode
 
 UNICODE_TARGET = \
        $(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a

diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index 7e39f9a..f142581 100644 (file)
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -1,4 +1,4 @@
-WMC_BASE = tools$(SEP)wmc
+WMC_BASE = .$(SEP)tools$(SEP)wmc
 
 WMC_TARGET = \
        $(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX)

diff --git a/reactos/tools/wpp/wpp.mak b/reactos/tools/wpp/wpp.mak
index 965d6f1..70bd90b 100644 (file)
--- a/reactos/tools/wpp/wpp.mak
+++ b/reactos/tools/wpp/wpp.mak
@@ -1,4 +1,4 @@
-WPP_BASE = tools$(SEP)wpp
+WPP_BASE = .$(SEP)tools$(SEP)wpp
 
 WPP_TARGET = \
        $(ROS_INTERMEDIATE)$(WPP_BASE)$(SEP)libwpp.a

diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak
index a5a4d35..ee7f090 100644 (file)
--- a/reactos/tools/wrc/wrc.mak
+++ b/reactos/tools/wrc/wrc.mak
@@ -1,4 +1,4 @@
-WRC_BASE = tools$(SEP)wrc
+WRC_BASE = .$(SEP)tools$(SEP)wrc
 
 WRC_TARGET = \
        $(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX)