From b2f8a0f0479709daa9c84ad86ce52cdf8d618045 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Wed, 25 May 2016 09:35:28 -0400 Subject: [PATCH 1/3] examples/uavcan: Update configuration --- examples/uavcan/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/uavcan/Kconfig b/examples/uavcan/Kconfig index 6d47c3b57..a8b980fb5 100644 --- a/examples/uavcan/Kconfig +++ b/examples/uavcan/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_UAVCAN bool "UAVCAN example" default n - depends on CANUTILS_UAVCAN + depends on CANUTILS_LIBUAVCAN ---help--- Enable the UAVCAN example From 6a0bb1374a32c7c0f1f402b24f17c652548ba5c5 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Wed, 25 May 2016 09:44:06 -0400 Subject: [PATCH 2/3] libuavcan: Delete libuavcan directory on distclean --- canutils/libuavcan/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/canutils/libuavcan/Makefile b/canutils/libuavcan/Makefile index c4752e69b..5e13e7244 100644 --- a/canutils/libuavcan/Makefile +++ b/canutils/libuavcan/Makefile @@ -249,6 +249,7 @@ clean: distclean: clean $(call DELFILE, Make.dep) $(call DELFILE, .depend) + $(call DELDIR, libuavcan) $(call DELDIR, $(LIBUAVCAN_UNPACKNAME)) $(call DELFILE, $(LIBUAVCAN_PACKNAME)) $(call DELDIR, $(DSDL_UNPACKNAME)) From ff8f175cd235c21e559fa7154fca02a45b0a69a6 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Wed, 25 May 2016 09:58:43 -0400 Subject: [PATCH 3/3] libuavcan: Delete directories before unpacking --- canutils/libuavcan/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/canutils/libuavcan/Makefile b/canutils/libuavcan/Makefile index 5e13e7244..05fc45f61 100644 --- a/canutils/libuavcan/Makefile +++ b/canutils/libuavcan/Makefile @@ -182,6 +182,7 @@ $(LIBUAVCAN_PACKNAME): $(LIBUAVCAN_UNPACKNAME): $(LIBUAVCAN_PACKNAME) @echo "Unpacking: $< -> $@" + $(call DELDIR, $@) $(Q) $(UNPACK) $< $(Q) touch $@ @@ -191,6 +192,7 @@ $(DSDL_PACKNAME): $(DSDL_UNPACKNAME): $(DSDL_PACKNAME) @echo "Unpacking: $< -> $@" + $(call DELDIR, $@) $(Q) $(UNPACK) $< $(Q) touch $@ @@ -200,11 +202,13 @@ $(PYUAVCAN_PACKNAME): $(PYUAVCAN_UNPACKNAME): $(PYUAVCAN_PACKNAME) @echo "Unpacking: $< -> $@" + $(call DELDIR, $@) $(Q) $(UNPACK) $< $(Q) touch $@ libuavcan: $(LIBUAVCAN_UNPACKNAME) $(DSDL_UNPACKNAME) $(PYUAVCAN_UNPACKNAME) - $(Q) cp -R $(LIBUAVCAN_UNPACKNAME) libuavcan + $(call DELDIR, $@) + $(Q) cp -R $(LIBUAVCAN_UNPACKNAME) $@ $(Q) if [ -r $(LIBUAVCAN_PATCHNAME) ]; then \ cat $(LIBUAVCAN_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \ fi