mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
now that "Only write file if modified" issue is solved we can depend on uavobjects in makefile and remove the notes regarding that issue
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2099 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
f5f3b7d8e6
commit
28ec908426
18
Makefile
18
Makefile
@ -184,13 +184,8 @@ all_ground: uavobjgenerator openpilotgcs
|
|||||||
.PHONY: gcs
|
.PHONY: gcs
|
||||||
gcs: openpilotgcs
|
gcs: openpilotgcs
|
||||||
|
|
||||||
# Note: openpilotgcs should depend on uavobjects directly since it uses
|
|
||||||
# the generated uavobject files. This is commented out since the
|
|
||||||
# uavobjgenerator tool always regenerates its output files
|
|
||||||
# triggering unnecessary rebuilds of the elf file.
|
|
||||||
|
|
||||||
.PHONY: openpilotgcs
|
.PHONY: openpilotgcs
|
||||||
openpilotgcs: #uavobjects
|
openpilotgcs: uavobjects
|
||||||
mkdir -p $(BUILD_DIR)/$@
|
mkdir -p $(BUILD_DIR)/$@
|
||||||
( cd $(BUILD_DIR)/$@ ; \
|
( cd $(BUILD_DIR)/$@ ; \
|
||||||
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
|
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
|
||||||
@ -222,12 +217,7 @@ all_flight: openpilot_elf ahrs_elf
|
|||||||
.PHONY: openpilot
|
.PHONY: openpilot
|
||||||
openpilot: openpilot_elf
|
openpilot: openpilot_elf
|
||||||
|
|
||||||
# Note: openpilot_* should depend on uavobjects directly since it uses
|
openpilot_%: uavobjects
|
||||||
# the generated uavobject files. This is commented out since the
|
|
||||||
# uavobjgenerator tool always regenerates its output files
|
|
||||||
# triggering unnecessary rebuilds of the elf file.
|
|
||||||
|
|
||||||
openpilot_%: #uavobjects
|
|
||||||
mkdir -p $(BUILD_DIR)/openpilot
|
mkdir -p $(BUILD_DIR)/openpilot
|
||||||
$(MAKE) OUTDIR="$(BUILD_DIR)/openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/OpenPilot $*
|
$(MAKE) OUTDIR="$(BUILD_DIR)/openpilot" TCHAIN_PREFIX="$(ARM_SDK_PREFIX)" REMOVE_CMD="$(RM)" OOCD_EXE="$(OPENOCD)" -C $(ROOT_DIR)/flight/OpenPilot $*
|
||||||
|
|
||||||
@ -241,9 +231,7 @@ ahrs_%:
|
|||||||
.PHONY: sim_posix
|
.PHONY: sim_posix
|
||||||
sim_posix: sim_posix_elf
|
sim_posix: sim_posix_elf
|
||||||
|
|
||||||
# Note: sim_* should depend on uavobjects directly - same reasons as above.
|
sim_posix_%: uavobjects
|
||||||
|
|
||||||
sim_posix_%: #uavobjects
|
|
||||||
mkdir -p $(BUILD_DIR)/simulation
|
mkdir -p $(BUILD_DIR)/simulation
|
||||||
$(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.posix $*
|
$(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.posix $*
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user