From 08a400e41b6f1024addfee392139ae1019e86c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 7 Nov 2007 11:29:57 +0000 Subject: [PATCH] On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT See issue #2518 for more details. svn path=/trunk/; revision=30238 --- reactos/Makefile | 2 -- reactos/tools/bin2c.mak | 2 +- reactos/tools/bin2res/bin2res.mak | 2 +- reactos/tools/buildno/buildno.mak | 2 +- reactos/tools/cabman/cabman.mak | 2 +- reactos/tools/cdmake/cdmake.mak | 2 +- reactos/tools/gendib/gendib.mak | 2 +- reactos/tools/mkhive/mkhive.mak | 2 +- reactos/tools/nci/nci.mak | 2 +- reactos/tools/ofw_interface/ofw_interface.mak | 2 +- reactos/tools/pefixup.mak | 2 +- reactos/tools/raddr2line.mak | 2 +- reactos/tools/rbuild/rbuild.mak | 4 ++-- reactos/tools/rgenstat/rgenstat.mak | 2 +- reactos/tools/rsym.mak | 2 +- reactos/tools/sysreg/sysreg.mak | 2 +- reactos/tools/widl/widl.mak | 2 +- reactos/tools/widl_new/widl.mak | 2 +- reactos/tools/winebuild/winebuild.mak | 2 +- reactos/tools/wmc/wmc.mak | 2 +- reactos/tools/wrc/wrc.mak | 2 +- 21 files changed, 21 insertions(+), 23 deletions(-) diff --git a/reactos/Makefile b/reactos/Makefile index 63d8c4ccc87..4f93d760b4d 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -305,7 +305,6 @@ ifeq ($(OSTYPE),msys) HOST=mingw32-linux endif ifeq ($(HOST),mingw32-linux) - export EXEPREFIX = ./ ifeq ($(OSTYPE),msys) export EXEPOSTFIX = .exe else @@ -317,7 +316,6 @@ ifeq ($(HOST),mingw32-linux) cp = $(Q)cp NUL = /dev/null else # mingw32-windows - export EXEPREFIX = export EXEPOSTFIX = .exe ROS_EMPTY = export SEP = \$(ROS_EMPTY) diff --git a/reactos/tools/bin2c.mak b/reactos/tools/bin2c.mak index d3a59933ae1..28b3545c1d6 100644 --- a/reactos/tools/bin2c.mak +++ b/reactos/tools/bin2c.mak @@ -7,7 +7,7 @@ BIN2C_OUT = $(OUTPUT_)$(BIN2C_BASE) BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) BIN2C_TARGET = \ - $(EXEPREFIX)$(BIN2C_OUT_)bin2c$(EXEPOSTFIX) + $(BIN2C_OUT_)bin2c$(EXEPOSTFIX) BIN2C_SOURCES = \ $(BIN2C_BASE_)bin2c.c diff --git a/reactos/tools/bin2res/bin2res.mak b/reactos/tools/bin2res/bin2res.mak index eba3cd35fb9..872c73580c2 100644 --- a/reactos/tools/bin2res/bin2res.mak +++ b/reactos/tools/bin2res/bin2res.mak @@ -16,7 +16,7 @@ $(BIN2RES_OUT): | $(TOOLS_OUT) endif BIN2RES_TARGET = \ - $(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) + $(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) BIN2RES_DEPENDS = $(BUILDNO_H) diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak index e6394c881b0..a451b9078b4 100644 --- a/reactos/tools/buildno/buildno.mak +++ b/reactos/tools/buildno/buildno.mak @@ -16,7 +16,7 @@ $(BUILDNO_OUT): | $(TOOLS_OUT) endif BUILDNO_TARGET = \ - $(EXEPREFIX)$(BUILDNO_OUT_)buildno$(EXEPOSTFIX) + $(BUILDNO_OUT_)buildno$(EXEPOSTFIX) BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \ buildno.cpp \ diff --git a/reactos/tools/cabman/cabman.mak b/reactos/tools/cabman/cabman.mak index e03afe9cd21..daa9e9b4d04 100755 --- a/reactos/tools/cabman/cabman.mak +++ b/reactos/tools/cabman/cabman.mak @@ -16,7 +16,7 @@ $(CABMAN_OUT): | $(TOOLS_OUT) endif CABMAN_TARGET = \ - $(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX) + $(CABMAN_OUT_)cabman$(EXEPOSTFIX) CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \ cabinet.cxx \ diff --git a/reactos/tools/cdmake/cdmake.mak b/reactos/tools/cdmake/cdmake.mak index 17ab935c0ed..182ffe7f80e 100644 --- a/reactos/tools/cdmake/cdmake.mak +++ b/reactos/tools/cdmake/cdmake.mak @@ -16,7 +16,7 @@ $(CDMAKE_OUT): | $(TOOLS_OUT) endif CDMAKE_TARGET = \ - $(EXEPREFIX)$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) + $(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \ cdmake.c \ diff --git a/reactos/tools/gendib/gendib.mak b/reactos/tools/gendib/gendib.mak index 46ad198f234..98de71cb27a 100644 --- a/reactos/tools/gendib/gendib.mak +++ b/reactos/tools/gendib/gendib.mak @@ -16,7 +16,7 @@ $(GENDIB_OUT): | $(TOOLS_OUT) endif GENDIB_TARGET = \ - $(EXEPREFIX)$(GENDIB_OUT_)gendib$(EXEPOSTFIX) + $(GENDIB_OUT_)gendib$(EXEPOSTFIX) GENDIB_SOURCES = \ $(GENDIB_BASE_)gendib.c diff --git a/reactos/tools/mkhive/mkhive.mak b/reactos/tools/mkhive/mkhive.mak index 22ac8d0ed2c..e31164dc328 100644 --- a/reactos/tools/mkhive/mkhive.mak +++ b/reactos/tools/mkhive/mkhive.mak @@ -16,7 +16,7 @@ $(MKHIVE_OUT): | $(TOOLS_OUT) endif MKHIVE_TARGET = \ - $(EXEPREFIX)$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) + $(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \ binhive.c \ diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak index d2cc8bf1c0d..564adb5c20c 100644 --- a/reactos/tools/nci/nci.mak +++ b/reactos/tools/nci/nci.mak @@ -16,7 +16,7 @@ $(NCI_OUT): | $(TOOLS_OUT) endif NCI_TARGET = \ - $(EXEPREFIX)$(NCI_OUT_)nci$(EXEPOSTFIX) + $(NCI_OUT_)nci$(EXEPOSTFIX) NCI_SOURCES = \ $(NCI_BASE_)ncitool.c diff --git a/reactos/tools/ofw_interface/ofw_interface.mak b/reactos/tools/ofw_interface/ofw_interface.mak index 15876a399c5..105a072031e 100644 --- a/reactos/tools/ofw_interface/ofw_interface.mak +++ b/reactos/tools/ofw_interface/ofw_interface.mak @@ -25,7 +25,7 @@ $(OFW_INTERFACE_OUT): | $(TOOLS_OUT) endif OFW_INTERFACE_TARGET = \ - $(EXEPREFIX)$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) + $(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) OFW_INTERFACE_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \ ofw_interface.cpp \ diff --git a/reactos/tools/pefixup.mak b/reactos/tools/pefixup.mak index 0cd785380fc..3ceb374b7e2 100644 --- a/reactos/tools/pefixup.mak +++ b/reactos/tools/pefixup.mak @@ -7,7 +7,7 @@ PEFIXUP_OUT = $(OUTPUT_)$(PEFIXUP_BASE) PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP) PEFIXUP_TARGET = \ - $(EXEPREFIX)$(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) + $(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) PEFIXUP_SOURCES = \ $(PEFIXUP_BASE_)pefixup.c diff --git a/reactos/tools/raddr2line.mak b/reactos/tools/raddr2line.mak index 29bb0806ce9..4f0c7c2add7 100644 --- a/reactos/tools/raddr2line.mak +++ b/reactos/tools/raddr2line.mak @@ -7,7 +7,7 @@ RADDR2LINE_OUT = $(OUTPUT_)$(RADDR2LINE_BASE) RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP) RADDR2LINE_TARGET = \ - $(EXEPREFIX)$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) + $(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) RADDR2LINE_SOURCES = \ $(RADDR2LINE_BASE_)raddr2line.c \ diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak index 126eed24905..bfeccbccbc4 100644 --- a/reactos/tools/rbuild/rbuild.mak +++ b/reactos/tools/rbuild/rbuild.mak @@ -191,10 +191,10 @@ endif RBUILD_TARGET = \ - $(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX) + $(RBUILD_OUT_)rbuild$(EXEPOSTFIX) RBUILD_TEST_TARGET = \ - $(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) + $(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \ mingw.cpp \ diff --git a/reactos/tools/rgenstat/rgenstat.mak b/reactos/tools/rgenstat/rgenstat.mak index db06f33c3d6..6a85bfe26d3 100644 --- a/reactos/tools/rgenstat/rgenstat.mak +++ b/reactos/tools/rgenstat/rgenstat.mak @@ -16,7 +16,7 @@ $(RGENSTAT_OUT): | $(TOOLS_OUT) endif RGENSTAT_TARGET = \ - $(EXEPREFIX)$(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) + $(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \ rgenstat.c \ diff --git a/reactos/tools/rsym.mak b/reactos/tools/rsym.mak index ad6b383de87..c87c61cd8a1 100644 --- a/reactos/tools/rsym.mak +++ b/reactos/tools/rsym.mak @@ -7,7 +7,7 @@ RSYM_OUT = $(OUTPUT_)$(RSYM_BASE) RSYM_OUT_ = $(RSYM_OUT)$(SEP) RSYM_TARGET = \ - $(EXEPREFIX)$(RSYM_OUT_)rsym$(EXEPOSTFIX) + $(RSYM_OUT_)rsym$(EXEPOSTFIX) RSYM_SOURCES = \ $(RSYM_BASE_)rsym.c \ diff --git a/reactos/tools/sysreg/sysreg.mak b/reactos/tools/sysreg/sysreg.mak index b83f4862c7f..a92ff934e6c 100644 --- a/reactos/tools/sysreg/sysreg.mak +++ b/reactos/tools/sysreg/sysreg.mak @@ -16,7 +16,7 @@ $(SYSREGBUILD_OUT): | $(TOOLS_OUT) endif SYSREGBUILD_TARGET = \ - $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) + $(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ conf_parser.cpp \ diff --git a/reactos/tools/widl/widl.mak b/reactos/tools/widl/widl.mak index 9106dc0faf7..cb328cdfbcb 100644 --- a/reactos/tools/widl/widl.mak +++ b/reactos/tools/widl/widl.mak @@ -33,7 +33,7 @@ $(WIDL_PORT_OUT): | $(WIDL_OUT) endif WIDL_TARGET = \ - $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) + $(WIDL_OUT_)widl$(EXEPOSTFIX) WIDL_DEPENDS = $(BUILDNO_H) diff --git a/reactos/tools/widl_new/widl.mak b/reactos/tools/widl_new/widl.mak index c0abd7f26cf..de6813ac536 100644 --- a/reactos/tools/widl_new/widl.mak +++ b/reactos/tools/widl_new/widl.mak @@ -33,7 +33,7 @@ $(WIDL_PORT_OUT): | $(WIDL_OUT) endif WIDL_TARGET = \ - $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) + $(WIDL_OUT_)widl$(EXEPOSTFIX) WIDL_DEPENDS = $(BUILDNO_H) diff --git a/reactos/tools/winebuild/winebuild.mak b/reactos/tools/winebuild/winebuild.mak index 451ae722fb5..2db9440f246 100644 --- a/reactos/tools/winebuild/winebuild.mak +++ b/reactos/tools/winebuild/winebuild.mak @@ -16,7 +16,7 @@ $(WINEBUILD_OUT): | $(TOOLS_OUT) endif WINEBUILD_TARGET = \ - $(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) + $(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) WINEBUILD_DEPENDS = $(BUILDNO_H) diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak index ec846c5bb1d..9c0eff1df84 100644 --- a/reactos/tools/wmc/wmc.mak +++ b/reactos/tools/wmc/wmc.mak @@ -16,7 +16,7 @@ $(WMC_OUT): | $(TOOLS_OUT) endif WMC_TARGET = \ - $(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX) + $(WMC_OUT_)wmc$(EXEPOSTFIX) WMC_DEPENDS = $(BUILDNO_H) diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak index 2b520dc0b86..2a84b11be90 100644 --- a/reactos/tools/wrc/wrc.mak +++ b/reactos/tools/wrc/wrc.mak @@ -33,7 +33,7 @@ $(WRC_PORT_OUT): | $(WRC_OUT) endif WRC_TARGET = \ - $(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX) + $(WRC_OUT_)wrc$(EXEPOSTFIX) WRC_DEPENDS = $(BUILDNO_H)