Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 10:17:45 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Fixes dependency not being cleaned by keeping the uavcan artifacts in the BUILD_DIR

Browse Source
This commit is contained in:
David Sidrane
2015-03-25 08:11:32 -10:00
parent 17615b22a4
commit 7be4298ba1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uavcan/module.mk
+4 -2
View File
@@ -58,7 +58,8 @@ SRCS += sensors/sensor_bridge.cpp \
# libuavcan # libuavcan
# #
include $(PX4_LIB_DIR)uavcan/libuavcan/include.mk include $(PX4_LIB_DIR)uavcan/libuavcan/include.mk
SRCS += $(LIBUAVCAN_SRC) # Use the relitive path to keep the genrated files in the BUILD_DIR
SRCS += $(subst $(PX4_MODULE_SRC),../../,$(LIBUAVCAN_SRC))
INCLUDE_DIRS += $(LIBUAVCAN_INC) INCLUDE_DIRS += $(LIBUAVCAN_INC)
# Since actual compiler mode is C++11, the library will default to UAVCAN_CPP11, but it will fail to compile # Since actual compiler mode is C++11, the library will default to UAVCAN_CPP11, but it will fail to compile
# because this platform lacks most of the standard library and STL. Hence we need to force C++03 mode. # because this platform lacks most of the standard library and STL. Hence we need to force C++03 mode.
@@ -68,7 +69,8 @@ override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAV
# libuavcan drivers for STM32 # libuavcan drivers for STM32
# #
include $(PX4_LIB_DIR)uavcan/libuavcan_drivers/stm32/driver/include.mk include $(PX4_LIB_DIR)uavcan/libuavcan_drivers/stm32/driver/include.mk
SRCS += $(LIBUAVCAN_STM32_SRC) # Use the relitive path to keep the genrated files in the BUILD_DIR
SRCS += $(subst $(PX4_MODULE_SRC),../../,$(LIBUAVCAN_STM32_SRC))
INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC) INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC)
override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=2 override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=2