apps/canutils/uavcan: Remove only the object files on make clean, not the libuavcan directory

This commit is contained in:
Paul A. Patience 2015-10-09 17:32:42 -04:00
parent 635bae81d9
commit 25a28708bf
2 changed files with 4 additions and 4 deletions

View File

@ -9,7 +9,7 @@ config CANUTILS_UAVCAN
depends on STM32_HAVE_CAN1 depends on STM32_HAVE_CAN1
depends on !STM32_CAN1 depends on !STM32_CAN1
depends on !STM32_CAN2 depends on !STM32_CAN2
depends on (STM32_HAVE_TIM2 && !STM32_TIM2) || (STM32_HAVE_TIM3 && !STM32_TIM3) || (STM32_HAVE_TIM4 && !STM32_TIM4) || (STM32_HAVE_TIM5 && !STM32_TIM5) || (STM32_HAVE_TIM6 && !STM32_TIM6) || (STM32_HAVE_TIM7 && !STM32_TIM7) depends on !STM32_TIM2 || (STM32_HAVE_TIM3 && !STM32_TIM3) || (STM32_HAVE_TIM4 && !STM32_TIM4) || (STM32_HAVE_TIM5 && !STM32_TIM5) || (STM32_HAVE_TIM6 && !STM32_TIM6) || (STM32_HAVE_TIM7 && !STM32_TIM7)
depends on C99_BOOL8 depends on C99_BOOL8
depends on HAVE_CXX depends on HAVE_CXX
depends on !DISABLE_POLL depends on !DISABLE_POLL
@ -62,7 +62,7 @@ config UAVCAN_STM32_NUM_IFACES
choice choice
prompt "Timer" prompt "Timer"
default UAVCAN_STM32_TIM2 if STM32_HAVE_TIM2 && !STM32_TIM2 default UAVCAN_STM32_TIM2 if !STM32_TIM2
default UAVCAN_STM32_TIM3 if STM32_HAVE_TIM3 && !STM32_TIM3 default UAVCAN_STM32_TIM3 if STM32_HAVE_TIM3 && !STM32_TIM3
default UAVCAN_STM32_TIM4 if STM32_HAVE_TIM4 && !STM32_TIM4 default UAVCAN_STM32_TIM4 if STM32_HAVE_TIM4 && !STM32_TIM4
default UAVCAN_STM32_TIM5 if STM32_HAVE_TIM5 && !STM32_TIM5 default UAVCAN_STM32_TIM5 if STM32_HAVE_TIM5 && !STM32_TIM5
@ -71,7 +71,7 @@ choice
config UAVCAN_STM32_TIM2 config UAVCAN_STM32_TIM2
bool "TIM2" bool "TIM2"
depends on STM32_HAVE_TIM2 && !STM32_TIM2 depends on !STM32_TIM2
---help--- ---help---
The library will use TIM2. The library will use TIM2.

View File

@ -237,7 +237,7 @@ depend: .depend
clean: clean:
$(call DELFILE, .built) $(call DELFILE, .built)
$(call DELDIR, libuavcan) $(foreach CXXOBJ, $(CXXOBJS), $(call DELFILE, $(CXXOBJ)))
$(call DELDIR, dsdlc_generated) $(call DELDIR, dsdlc_generated)
$(call DELDIR, $(APPDIR)$(DELIM)include$(DELIM)uavcan) $(call DELDIR, $(APPDIR)$(DELIM)include$(DELIM)uavcan)