1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00

OP-305: replace '-C dir' by 'cd dir &&' (Windows MSYS compatibility fix)

For unknown reason under Windows MSYS the make.exe doesn't like the
-C option in some configurations. So this change is made to provide
a cross-platform compatibility and take advantage of unix-like build
environment on Windows system.
This commit is contained in:
Oleg Semyonov 2011-05-02 20:15:26 +03:00
parent 21c4837f95
commit 86fe9edfed

View File

@ -286,7 +286,7 @@ openpilot: openpilot_bin
openpilot_%: uavobjects_flight openpilot_%: uavobjects_flight
$(V1) mkdir -p $(BUILD_DIR)/openpilot/dep $(V1) mkdir -p $(BUILD_DIR)/openpilot/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/OpenPilot $* $(V1) cd $(ROOT_DIR)/flight/OpenPilot && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: openpilot_clean .PHONY: openpilot_clean
openpilot_clean: openpilot_clean:
@ -298,7 +298,7 @@ bl_openpilot: bl_openpilot_elf
bl_openpilot_%: bl_openpilot_%:
$(V1) mkdir -p $(BUILD_DIR)/bl_openpilot/dep $(V1) mkdir -p $(BUILD_DIR)/bl_openpilot/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/Bootloaders/OpenPilot $* $(V1) cd $(ROOT_DIR)/flight/Bootloaders/OpenPilot && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: bl_openpilot_clean .PHONY: bl_openpilot_clean
bl_openpilot_clean: bl_openpilot_clean:
@ -310,7 +310,7 @@ ahrs: ahrs_bin
ahrs_%: uavobjects_flight ahrs_%: uavobjects_flight
$(V1) mkdir -p $(BUILD_DIR)/ahrs/dep $(V1) mkdir -p $(BUILD_DIR)/ahrs/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/ahrs" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/AHRS $* $(V1) cd $(ROOT_DIR)/flight/AHRS && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/ahrs" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: ahrs_clean .PHONY: ahrs_clean
ahrs_clean: ahrs_clean:
@ -322,7 +322,7 @@ bl_ahrs: bl_ahrs_elf
bl_ahrs_%: bl_ahrs_%:
$(V1) mkdir -p $(BUILD_DIR)/bl_ahrs/dep $(V1) mkdir -p $(BUILD_DIR)/bl_ahrs/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_ahrs" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/Bootloaders/AHRS $* $(V1) cd $(ROOT_DIR)/flight/Bootloaders/AHRS && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_ahrs" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: bl_ahrs_clean .PHONY: bl_ahrs_clean
bl_ahrs_clean: bl_ahrs_clean:
@ -334,7 +334,7 @@ coptercontrol: coptercontrol_bin
coptercontrol_%: uavobjects_flight coptercontrol_%: uavobjects_flight
$(V1) mkdir -p $(BUILD_DIR)/coptercontrol/dep $(V1) mkdir -p $(BUILD_DIR)/coptercontrol/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/coptercontrol" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/CopterControl $* $(V1) cd $(ROOT_DIR)/flight/CopterControl && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/coptercontrol" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: coptercontrol_clean .PHONY: coptercontrol_clean
coptercontrol_clean: coptercontrol_clean:
@ -346,7 +346,7 @@ bl_coptercontrol: bl_coptercontrol_elf
bl_coptercontrol_%: bl_coptercontrol_%:
$(V1) mkdir -p $(BUILD_DIR)/bl_coptercontrol/dep $(V1) mkdir -p $(BUILD_DIR)/bl_coptercontrol/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_coptercontrol" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/Bootloaders/CopterControl $* $(V1) cd $(ROOT_DIR)/flight/Bootloaders/CopterControl && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_coptercontrol" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: bl_coptercontrol_clean .PHONY: bl_coptercontrol_clean
bl_coptercontrol_clean: bl_coptercontrol_clean:
@ -358,7 +358,7 @@ pipxtreme: pipxtreme_bin
pipxtreme_%: uavobjects_flight pipxtreme_%: uavobjects_flight
$(V1) mkdir -p $(BUILD_DIR)/pipxtreme/dep $(V1) mkdir -p $(BUILD_DIR)/pipxtreme/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/pipxtreme" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/PipXtreme $* $(V1) cd $(ROOT_DIR)/flight/PipXtreme && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/pipxtreme" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: pipxtreme_clean .PHONY: pipxtreme_clean
pipxtreme_clean: pipxtreme_clean:
@ -370,7 +370,7 @@ bl_pipxtreme: bl_pipxtreme_elf
bl_pipxtreme_%: bl_pipxtreme_%:
$(V1) mkdir -p $(BUILD_DIR)/bl_pipxtreme/dep $(V1) mkdir -p $(BUILD_DIR)/bl_pipxtreme/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_pipxtreme" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/Bootloaders/PipXtreme $* $(V1) cd $(ROOT_DIR)/flight/Bootloaders/PipXtreme && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_pipxtreme" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: bl_pipxtreme_clean .PHONY: bl_pipxtreme_clean
bl_pipxtreme_clean: bl_pipxtreme_clean:
@ -382,7 +382,7 @@ ins: ins_bin
ins_%: uavobjects_flight ins_%: uavobjects_flight
$(V1) mkdir -p $(BUILD_DIR)/ins/dep $(V1) mkdir -p $(BUILD_DIR)/ins/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/ins" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/INS $* $(V1) cd $(ROOT_DIR)/flight/INS && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/ins" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: ins_clean .PHONY: ins_clean
ins_clean: ins_clean:
@ -394,7 +394,7 @@ bl_ins: bl_ins_elf
bl_ins_%: bl_ins_%:
$(V1) mkdir -p $(BUILD_DIR)/bl_ins/dep $(V1) mkdir -p $(BUILD_DIR)/bl_ins/dep
$(V1) $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_ins" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/Bootloaders/INS $* $(V1) cd $(ROOT_DIR)/flight/Bootloaders/INS && $(MAKE) -r --no-print-directory OUTDIR="$(BUILD_DIR)/bl_ins" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" $*
.PHONY: bl_ins_clean .PHONY: bl_ins_clean
bl_ins_clean: bl_ins_clean: