- fix makefiles to depend on TOOLS_OUT_ value than directly hardcoding it to $(OUTPUT)

svn path=/trunk/; revision=26147
2026-09-02 04:13:34 +00:00 · 2007-03-20 20:12:10 +00:00
parent 1f06d767be
commit f24347940e
18 changed files with 18 additions and 18 deletions
@@ -3,7 +3,7 @@ BIN2C_BASE_ = $(BIN2C_BASE)$(SEP)

 BIN2C_INT = $(INTERMEDIATE_)$(BIN2C_BASE)
 BIN2C_INT_ = $(BIN2C_INT)$(SEP)
-BIN2C_OUT = $(OUTPUT_)$(BIN2C_BASE)
+BIN2C_OUT = $(TOOLS_OUT_)$(BIN2C_BASE)
 BIN2C_OUT_ = $(BIN2C_OUT)$(SEP)

 BIN2C_TARGET = \
@@ -2,7 +2,7 @@ BIN2RES_BASE = $(TOOLS_BASE_)bin2res
 BIN2RES_BASE_ = $(BIN2RES_BASE)$(SEP)
 BIN2RES_INT = $(INTERMEDIATE_)$(BIN2RES_BASE)
 BIN2RES_INT_ = $(BIN2RES_INT)$(SEP)
-BIN2RES_OUT = $(OUTPUT_)$(BIN2RES_BASE)
+BIN2RES_OUT = $(TOOLS_OUT_)$(BIN2RES_BASE)
 BIN2RES_OUT_ = $(BIN2RES_OUT)$(SEP)

 $(BIN2RES_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ BUILDNO_BASE = $(TOOLS_BASE_)buildno
 BUILDNO_BASE_ = $(BUILDNO_BASE)$(SEP)
 BUILDNO_INT = $(INTERMEDIATE_)$(BUILDNO_BASE)
 BUILDNO_INT_ = $(BUILDNO_INT)$(SEP)
-BUILDNO_OUT = $(OUTPUT_)$(BUILDNO_BASE)
+BUILDNO_OUT = $(TOOLS_OUT_)$(BUILDNO_BASE)
 BUILDNO_OUT_ = $(BUILDNO_OUT)$(SEP)

 $(BUILDNO_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ CDMAKE_BASE = $(TOOLS_BASE_)cdmake
 CDMAKE_BASE_ = $(CDMAKE_BASE)$(SEP)
 CDMAKE_INT = $(INTERMEDIATE_)$(CDMAKE_BASE)
 CDMAKE_INT_ = $(CDMAKE_INT)$(SEP)
-CDMAKE_OUT = $(OUTPUT_)$(CDMAKE_BASE)
+CDMAKE_OUT = $(TOOLS_OUT_)$(CDMAKE_BASE)
 CDMAKE_OUT_ = $(CDMAKE_OUT)$(SEP)

 $(CDMAKE_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ DBGPRINT_BASE = $(TOOLS_BASE)$(SEP)dbgprint
 DBGPRINT_BASE_ = $(DBGPRINT_BASE)$(SEP)
 DBGPRINT_INT = $(INTERMEDIATE_)$(DBGPRINT_BASE)
 DBGPRINT_INT_ = $(DBGPRINT_INT)$(SEP)
-DBGPRINT_OUT = $(OUTPUT_)$(DBGPRINT_BASE)
+DBGPRINT_OUT = $(TOOLS_OUT_)$(DBGPRINT_BASE)
 DBGPRINT_OUT_ = $(DBGPRINT_OUT)$(SEP)

 $(DBGPRINT_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ GENDIB_BASE = $(TOOLS_BASE_)gendib
 GENDIB_BASE_ = $(GENDIB_BASE)$(SEP)
 GENDIB_INT = $(INTERMEDIATE_)$(GENDIB_BASE)
 GENDIB_INT_ = $(GENDIB_INT)$(SEP)
-GENDIB_OUT = $(OUTPUT_)$(GENDIB_BASE)
+GENDIB_OUT = $(TOOLS_OUT_)$(GENDIB_BASE)
 GENDIB_OUT_ = $(GENDIB_OUT)$(SEP)

 $(GENDIB_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ MKHIVE_BASE = $(TOOLS_BASE_)mkhive
 MKHIVE_BASE_ = $(MKHIVE_BASE)$(SEP)
 MKHIVE_INT = $(INTERMEDIATE_)$(MKHIVE_BASE)
 MKHIVE_INT_ = $(MKHIVE_INT)$(SEP)
-MKHIVE_OUT = $(OUTPUT_)$(MKHIVE_BASE)
+MKHIVE_OUT = $(TOOLS_OUT_)$(MKHIVE_BASE)
 MKHIVE_OUT_ = $(MKHIVE_OUT)$(SEP)

 $(MKHIVE_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ NCI_BASE = $(TOOLS_BASE_)nci
 NCI_BASE_ = $(NCI_BASE)$(SEP)
 NCI_INT = $(INTERMEDIATE_)$(NCI_BASE)
 NCI_INT_ = $(NCI_INT)$(SEP)
-NCI_OUT = $(OUTPUT_)$(NCI_BASE)
+NCI_OUT = $(TOOLS_OUT_)$(NCI_BASE)
 NCI_OUT_ = $(NCI_OUT)$(SEP)

 $(NCI_INT): | $(TOOLS_INT)
@@ -3,7 +3,7 @@ PEFIXUP_BASE_ = $(PEFIXUP_BASE)$(SEP)

 PEFIXUP_INT = $(INTERMEDIATE_)$(PEFIXUP_BASE)
 PEFIXUP_INT_ = $(PEFIXUP_INT)$(SEP)
-PEFIXUP_OUT = $(OUTPUT_)$(PEFIXUP_BASE)
+PEFIXUP_OUT = $(ROS_TOOLS_)$(PEFIXUP_BASE)
 PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP)

 PEFIXUP_TARGET = \
@@ -2,7 +2,7 @@ RGENSTAT_BASE = $(TOOLS_BASE_)rgenstat
 RGENSTAT_BASE_ = $(RGENSTAT_BASE)$(SEP)
 RGENSTAT_INT = $(INTERMEDIATE_)$(RGENSTAT_BASE)
 RGENSTAT_INT_ = $(RGENSTAT_INT)$(SEP)
-RGENSTAT_OUT = $(OUTPUT_)$(RGENSTAT_BASE)
+RGENSTAT_OUT = $(TOOLS_OUT_)$(RGENSTAT_BASE)
 RGENSTAT_OUT_ = $(RGENSTAT_OUT)$(SEP)

 $(RGENSTAT_INT): | $(TOOLS_INT)
@@ -3,7 +3,7 @@ RSYM_BASE_ = $(RSYM_BASE)$(SEP)

 RSYM_INT = $(INTERMEDIATE_)$(RSYM_BASE)
 RSYM_INT_ = $(RSYM_INT)$(SEP)
-RSYM_OUT = $(OUTPUT_)$(RSYM_BASE)
+RSYM_OUT = $(ROS_TOOLS_)$(RSYM_BASE)
 RSYM_OUT_ = $(RSYM_OUT)$(SEP)

 RSYM_TARGET = \
@@ -2,7 +2,7 @@ SYSREGBUILD_BASE = $(TOOLS_BASE)$(SEP)sysreg
 SYSREGBUILD_BASE_ = $(SYSREGBUILD_BASE)$(SEP)
 SYSREGBUILD_INT = $(INTERMEDIATE_)$(SYSREGBUILD_BASE)
 SYSREGBUILD_INT_ = $(SYSREGBUILD_INT)$(SEP)
-SYSREGBUILD_OUT = $(OUTPUT_)$(SYSREGBUILD_BASE)
+SYSREGBUILD_OUT = $(TOOLS_OUT_)$(SYSREGBUILD_BASE)
 SYSREGBUILD_OUT_ = $(SYSREGBUILD_OUT)$(SEP)

 $(SYSREGBUILD_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ UNICODE_BASE = $(TOOLS_BASE_)unicode
 UNICODE_BASE_ = $(UNICODE_BASE)$(SEP)
 UNICODE_INT = $(INTERMEDIATE_)$(UNICODE_BASE)
 UNICODE_INT_ = $(UNICODE_INT)$(SEP)
-UNICODE_OUT = $(OUTPUT_)$(UNICODE_BASE)
+UNICODE_OUT = $(TOOLS_OUT_)$(UNICODE_BASE)
 UNICODE_OUT_ = $(UNICODE_OUT)$(SEP)

 $(UNICODE_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ WIDL_BASE = $(TOOLS_BASE)$(SEP)widl
 WIDL_BASE_ = $(WIDL_BASE)$(SEP)
 WIDL_INT = $(INTERMEDIATE_)$(WIDL_BASE)
 WIDL_INT_ = $(WIDL_INT)$(SEP)
-WIDL_OUT = $(OUTPUT_)$(WIDL_BASE)
+WIDL_OUT = $(TOOLS_OUT_)$(WIDL_BASE)
 WIDL_OUT_ = $(WIDL_OUT)$(SEP)

 $(WIDL_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ WINEBUILD_BASE = $(TOOLS_BASE)$(SEP)winebuild
 WINEBUILD_BASE_ = $(WINEBUILD_BASE)$(SEP)
 WINEBUILD_INT = $(INTERMEDIATE_)$(WINEBUILD_BASE)
 WINEBUILD_INT_ = $(WINEBUILD_INT)$(SEP)
-WINEBUILD_OUT = $(OUTPUT_)$(WINEBUILD_BASE)
+WINEBUILD_OUT = $(TOOLS_OUT_)$(WINEBUILD_BASE)
 WINEBUILD_OUT_ = $(WINEBUILD_OUT)$(SEP)

 $(WINEBUILD_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ WMC_BASE = $(TOOLS_BASE_)wmc
 WMC_BASE_ = $(WMC_BASE)$(SEP)
 WMC_INT = $(INTERMEDIATE_)$(WMC_BASE)
 WMC_INT_ = $(WMC_INT)$(SEP)
-WMC_OUT = $(OUTPUT_)$(WMC_BASE)
+WMC_OUT = $(TOOLS_OUT_)$(WMC_BASE)
 WMC_OUT_ = $(WMC_OUT)$(SEP)

 $(WMC_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ WPP_BASE = $(TOOLS_BASE_)wpp
 WPP_BASE_ = $(WPP_BASE)$(SEP)
 WPP_INT = $(INTERMEDIATE_)$(WPP_BASE)
 WPP_INT_ = $(WPP_INT)$(SEP)
-WPP_OUT = $(OUTPUT_)$(WPP_BASE)
+WPP_OUT = $(TOOLS_OUT_)$(WPP_BASE)
 WPP_OUT_ = $(WPP_OUT)$(SEP)

 $(WPP_INT): | $(TOOLS_INT)
@@ -2,7 +2,7 @@ WRC_BASE = $(TOOLS_BASE_)wrc
 WRC_BASE_ = $(WRC_BASE)$(SEP)
 WRC_INT = $(INTERMEDIATE_)$(WRC_BASE)
 WRC_INT_ = $(WRC_INT)$(SEP)
-WRC_OUT = $(OUTPUT_)$(WRC_BASE)
+WRC_OUT = $(TOOLS_OUT_)$(WRC_BASE)
 WRC_OUT_ = $(WRC_OUT)$(SEP)

 $(WRC_INT): | $(TOOLS_INT)