On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT

See issue #2518 for more details.

svn path=/trunk/; revision=30238
This commit is contained in:
Hervé Poussineau 2007-11-07 11:29:57 +00:00
parent 9a65b6cbc0
commit 08a400e41b
21 changed files with 21 additions and 23 deletions

View file

@ -305,7 +305,6 @@ ifeq ($(OSTYPE),msys)
HOST=mingw32-linux HOST=mingw32-linux
endif endif
ifeq ($(HOST),mingw32-linux) ifeq ($(HOST),mingw32-linux)
export EXEPREFIX = ./
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
export EXEPOSTFIX = .exe export EXEPOSTFIX = .exe
else else
@ -317,7 +316,6 @@ ifeq ($(HOST),mingw32-linux)
cp = $(Q)cp cp = $(Q)cp
NUL = /dev/null NUL = /dev/null
else # mingw32-windows else # mingw32-windows
export EXEPREFIX =
export EXEPOSTFIX = .exe export EXEPOSTFIX = .exe
ROS_EMPTY = ROS_EMPTY =
export SEP = \$(ROS_EMPTY) export SEP = \$(ROS_EMPTY)

View file

@ -7,7 +7,7 @@ BIN2C_OUT = $(OUTPUT_)$(BIN2C_BASE)
BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) BIN2C_OUT_ = $(BIN2C_OUT)$(SEP)
BIN2C_TARGET = \ BIN2C_TARGET = \
$(EXEPREFIX)$(BIN2C_OUT_)bin2c$(EXEPOSTFIX) $(BIN2C_OUT_)bin2c$(EXEPOSTFIX)
BIN2C_SOURCES = \ BIN2C_SOURCES = \
$(BIN2C_BASE_)bin2c.c $(BIN2C_BASE_)bin2c.c

View file

@ -16,7 +16,7 @@ $(BIN2RES_OUT): | $(TOOLS_OUT)
endif endif
BIN2RES_TARGET = \ BIN2RES_TARGET = \
$(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) $(BIN2RES_OUT_)bin2res$(EXEPOSTFIX)
BIN2RES_DEPENDS = $(BUILDNO_H) BIN2RES_DEPENDS = $(BUILDNO_H)

View file

@ -16,7 +16,7 @@ $(BUILDNO_OUT): | $(TOOLS_OUT)
endif endif
BUILDNO_TARGET = \ BUILDNO_TARGET = \
$(EXEPREFIX)$(BUILDNO_OUT_)buildno$(EXEPOSTFIX) $(BUILDNO_OUT_)buildno$(EXEPOSTFIX)
BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \ BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \
buildno.cpp \ buildno.cpp \

View file

@ -16,7 +16,7 @@ $(CABMAN_OUT): | $(TOOLS_OUT)
endif endif
CABMAN_TARGET = \ CABMAN_TARGET = \
$(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX) $(CABMAN_OUT_)cabman$(EXEPOSTFIX)
CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \ CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \
cabinet.cxx \ cabinet.cxx \

View file

@ -16,7 +16,7 @@ $(CDMAKE_OUT): | $(TOOLS_OUT)
endif endif
CDMAKE_TARGET = \ CDMAKE_TARGET = \
$(EXEPREFIX)$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) $(CDMAKE_OUT_)cdmake$(EXEPOSTFIX)
CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \ CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \
cdmake.c \ cdmake.c \

View file

@ -16,7 +16,7 @@ $(GENDIB_OUT): | $(TOOLS_OUT)
endif endif
GENDIB_TARGET = \ GENDIB_TARGET = \
$(EXEPREFIX)$(GENDIB_OUT_)gendib$(EXEPOSTFIX) $(GENDIB_OUT_)gendib$(EXEPOSTFIX)
GENDIB_SOURCES = \ GENDIB_SOURCES = \
$(GENDIB_BASE_)gendib.c $(GENDIB_BASE_)gendib.c

View file

@ -16,7 +16,7 @@ $(MKHIVE_OUT): | $(TOOLS_OUT)
endif endif
MKHIVE_TARGET = \ MKHIVE_TARGET = \
$(EXEPREFIX)$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) $(MKHIVE_OUT_)mkhive$(EXEPOSTFIX)
MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \ MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \
binhive.c \ binhive.c \

View file

@ -16,7 +16,7 @@ $(NCI_OUT): | $(TOOLS_OUT)
endif endif
NCI_TARGET = \ NCI_TARGET = \
$(EXEPREFIX)$(NCI_OUT_)nci$(EXEPOSTFIX) $(NCI_OUT_)nci$(EXEPOSTFIX)
NCI_SOURCES = \ NCI_SOURCES = \
$(NCI_BASE_)ncitool.c $(NCI_BASE_)ncitool.c

View file

@ -25,7 +25,7 @@ $(OFW_INTERFACE_OUT): | $(TOOLS_OUT)
endif endif
OFW_INTERFACE_TARGET = \ 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_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \
ofw_interface.cpp \ ofw_interface.cpp \

View file

@ -7,7 +7,7 @@ PEFIXUP_OUT = $(OUTPUT_)$(PEFIXUP_BASE)
PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP) PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP)
PEFIXUP_TARGET = \ PEFIXUP_TARGET = \
$(EXEPREFIX)$(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) $(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX)
PEFIXUP_SOURCES = \ PEFIXUP_SOURCES = \
$(PEFIXUP_BASE_)pefixup.c $(PEFIXUP_BASE_)pefixup.c

View file

@ -7,7 +7,7 @@ RADDR2LINE_OUT = $(OUTPUT_)$(RADDR2LINE_BASE)
RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP) RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP)
RADDR2LINE_TARGET = \ RADDR2LINE_TARGET = \
$(EXEPREFIX)$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) $(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX)
RADDR2LINE_SOURCES = \ RADDR2LINE_SOURCES = \
$(RADDR2LINE_BASE_)raddr2line.c \ $(RADDR2LINE_BASE_)raddr2line.c \

View file

@ -191,10 +191,10 @@ endif
RBUILD_TARGET = \ RBUILD_TARGET = \
$(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX) $(RBUILD_OUT_)rbuild$(EXEPOSTFIX)
RBUILD_TEST_TARGET = \ RBUILD_TEST_TARGET = \
$(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) $(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX)
RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \ RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \
mingw.cpp \ mingw.cpp \

View file

@ -16,7 +16,7 @@ $(RGENSTAT_OUT): | $(TOOLS_OUT)
endif endif
RGENSTAT_TARGET = \ RGENSTAT_TARGET = \
$(EXEPREFIX)$(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) $(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX)
RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \ RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \
rgenstat.c \ rgenstat.c \

View file

@ -7,7 +7,7 @@ RSYM_OUT = $(OUTPUT_)$(RSYM_BASE)
RSYM_OUT_ = $(RSYM_OUT)$(SEP) RSYM_OUT_ = $(RSYM_OUT)$(SEP)
RSYM_TARGET = \ RSYM_TARGET = \
$(EXEPREFIX)$(RSYM_OUT_)rsym$(EXEPOSTFIX) $(RSYM_OUT_)rsym$(EXEPOSTFIX)
RSYM_SOURCES = \ RSYM_SOURCES = \
$(RSYM_BASE_)rsym.c \ $(RSYM_BASE_)rsym.c \

View file

@ -16,7 +16,7 @@ $(SYSREGBUILD_OUT): | $(TOOLS_OUT)
endif endif
SYSREGBUILD_TARGET = \ SYSREGBUILD_TARGET = \
$(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) $(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX)
SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\
conf_parser.cpp \ conf_parser.cpp \

View file

@ -33,7 +33,7 @@ $(WIDL_PORT_OUT): | $(WIDL_OUT)
endif endif
WIDL_TARGET = \ WIDL_TARGET = \
$(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) $(WIDL_OUT_)widl$(EXEPOSTFIX)
WIDL_DEPENDS = $(BUILDNO_H) WIDL_DEPENDS = $(BUILDNO_H)

View file

@ -33,7 +33,7 @@ $(WIDL_PORT_OUT): | $(WIDL_OUT)
endif endif
WIDL_TARGET = \ WIDL_TARGET = \
$(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) $(WIDL_OUT_)widl$(EXEPOSTFIX)
WIDL_DEPENDS = $(BUILDNO_H) WIDL_DEPENDS = $(BUILDNO_H)

View file

@ -16,7 +16,7 @@ $(WINEBUILD_OUT): | $(TOOLS_OUT)
endif endif
WINEBUILD_TARGET = \ WINEBUILD_TARGET = \
$(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) $(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX)
WINEBUILD_DEPENDS = $(BUILDNO_H) WINEBUILD_DEPENDS = $(BUILDNO_H)

View file

@ -16,7 +16,7 @@ $(WMC_OUT): | $(TOOLS_OUT)
endif endif
WMC_TARGET = \ WMC_TARGET = \
$(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX) $(WMC_OUT_)wmc$(EXEPOSTFIX)
WMC_DEPENDS = $(BUILDNO_H) WMC_DEPENDS = $(BUILDNO_H)

View file

@ -33,7 +33,7 @@ $(WRC_PORT_OUT): | $(WRC_OUT)
endif endif
WRC_TARGET = \ WRC_TARGET = \
$(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX) $(WRC_OUT_)wrc$(EXEPOSTFIX)
WRC_DEPENDS = $(BUILDNO_H) WRC_DEPENDS = $(BUILDNO_H)