sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in paulpatience/nuttx-apps/libuavcan (pull request #38)

Browse Source 
libuavcan
This commit is contained in:
Gregory Nutt 2016-05-25 08:23:21 -06:00
commit ab3612d203
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
canutils/libuavcan/Makefile
View File

@ -182,6 +182,7 @@ $(LIBUAVCAN_PACKNAME):
$(LIBUAVCAN_UNPACKNAME): $(LIBUAVCAN_PACKNAME) $(LIBUAVCAN_UNPACKNAME): $(LIBUAVCAN_PACKNAME)
@echo "Unpacking: $< -> $@" @echo "Unpacking: $< -> $@"
$(call DELDIR, $@)
$(Q) $(UNPACK) $< $(Q) $(UNPACK) $<
$(Q) touch $@ $(Q) touch $@
@ -191,6 +192,7 @@ $(DSDL_PACKNAME):
$(DSDL_UNPACKNAME): $(DSDL_PACKNAME) $(DSDL_UNPACKNAME): $(DSDL_PACKNAME)
@echo "Unpacking: $< -> $@" @echo "Unpacking: $< -> $@"
$(call DELDIR, $@)
$(Q) $(UNPACK) $< $(Q) $(UNPACK) $<
$(Q) touch $@ $(Q) touch $@
@ -200,11 +202,13 @@ $(PYUAVCAN_PACKNAME):
$(PYUAVCAN_UNPACKNAME): $(PYUAVCAN_PACKNAME) $(PYUAVCAN_UNPACKNAME): $(PYUAVCAN_PACKNAME)
@echo "Unpacking: $< -> $@" @echo "Unpacking: $< -> $@"
$(call DELDIR, $@)
$(Q) $(UNPACK) $< $(Q) $(UNPACK) $<
$(Q) touch $@ $(Q) touch $@
libuavcan: $(LIBUAVCAN_UNPACKNAME) $(DSDL_UNPACKNAME) $(PYUAVCAN_UNPACKNAME) 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 \ $(Q) if [ -r $(LIBUAVCAN_PATCHNAME) ]; then \
cat $(LIBUAVCAN_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \ cat $(LIBUAVCAN_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \
fi fi
@ -249,6 +253,7 @@ clean:
distclean: clean distclean: clean
$(call DELFILE, Make.dep) $(call DELFILE, Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)
$(call DELDIR, libuavcan)
$(call DELDIR, $(LIBUAVCAN_UNPACKNAME)) $(call DELDIR, $(LIBUAVCAN_UNPACKNAME))
$(call DELFILE, $(LIBUAVCAN_PACKNAME)) $(call DELFILE, $(LIBUAVCAN_PACKNAME))
$(call DELDIR, $(DSDL_UNPACKNAME)) $(call DELDIR, $(DSDL_UNPACKNAME))

2
examples/uavcan/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_UAVCAN config EXAMPLES_UAVCAN
bool "UAVCAN example" bool "UAVCAN example"
default n default n
depends on CANUTILS_UAVCAN depends on CANUTILS_LIBUAVCAN
---help--- ---help---
Enable the UAVCAN example Enable the UAVCAN example