diff options
| author | Lorenz Meier <lorenz@px4.io> | 2015-04-16 20:06:53 +0200 |
|---|---|---|
| committer | Lorenz Meier <lorenz@px4.io> | 2015-04-16 20:06:53 +0200 |
| commit | bb9e5d0d4c719367a3645432fd3f544638f90418 (patch) | |
| tree | aa73b3fc1eed5ef4f9c4aeb666879efb77973763 /src/modules/uavcan | |
| parent | 385830d055892923c13a596c724801a20d038d13 (diff) | |
| parent | 7be4298ba1fb0628e80b2ddf938f5c6937611e48 (diff) | |
| download | px4-firmware-bb9e5d0d4c719367a3645432fd3f544638f90418.tar.gz px4-firmware-bb9e5d0d4c719367a3645432fd3f544638f90418.tar.bz2 px4-firmware-bb9e5d0d4c719367a3645432fd3f544638f90418.zip | |
Merge pull request #2039 from PX4/fix_uavcan_deps
Fixes dependency not being cleaned by keeping the uavcan artifacts in th...
Diffstat (limited to 'src/modules/uavcan')
| -rw-r--r-- | src/modules/uavcan/module.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/uavcan/module.mk b/src/modules/uavcan/module.mk index 4f63629a0..f7feeadab 100644 --- a/src/modules/uavcan/module.mk +++ b/src/modules/uavcan/module.mk @@ -58,7 +58,8 @@ SRCS += sensors/sensor_bridge.cpp \ # libuavcan # 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) # 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. @@ -68,7 +69,8 @@ override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAV # libuavcan drivers for STM32 # 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) override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=2 |