aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDavid Sidrane <david_s5@nscdg.com>2014-12-25 06:34:23 -1000
committerDavid Sidrane <david_s5@nscdg.com>2015-04-07 07:48:25 -1000
commit8129f7433d8d8e9a12a8abf8c3eb7d1885e22698 (patch)
treef8d71463ed45d4caac3bc8944135694e1b745863 /Makefile
parentca4ead5d324de7aa1cffab69ffe9ba9e35f82223 (diff)
downloadpx4-firmware-8129f7433d8d8e9a12a8abf8c3eb7d1885e22698.tar.gz
px4-firmware-8129f7433d8d8e9a12a8abf8c3eb7d1885e22698.tar.bz2
px4-firmware-8129f7433d8d8e9a12a8abf8c3eb7d1885e22698.zip
Added the ability to apply PX4 specific patches to Nuttx
At the moment this entails adding NuttX/nuttx/arch/arm/include/math.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 7c8fa7a4f..23fbf8f08 100644
--- a/Makefile
+++ b/Makefile
@@ -190,23 +190,23 @@ NUTTX_PATCHED = $(NUTTX_SRC).patchedpx4common
.PHONY: nuttxpatches
nuttxpatches:
- $(Q) -if [ ! -f $(NUTTX_PATCHED) ]; then \
+ $(Q) if [ ! -f $(NUTTX_PATCHED) ]; then \
for patch in $(NUTTX_PATCHES); \
do \
- $(PATCH) -p0 -N < $$patch >/dev/null; \
+ $(PATCH) -p0 -N < $$patch; \
done \
fi
$(Q) $(TOUCH) $(NUTTX_PATCHED)
.PHONY: cleannuttxpatches
cleannuttxpatches:
- $(Q) -if [ -f $(NUTTX_PATCHED) ]; then \
+ $(Q) if [ ! -f $(NUTTX_PATCHED) ]; then \
for patch in $(NUTTX_PATCHES); \
do \
- $(PATCH) -p0 -N -R -r - < $$patch >/dev/null; \
+ $(PATCH) -p0 -N -R < $$patch; \
done \
fi
- $(Q) $(REMOVE) $(NUTTX_PATCHED)
+ $(Q) $(TOUCH) $(NUTTX_PATCHED)
#
# The user can run the NuttX 'menuconfig' tool for a single board configuration with
@@ -301,11 +301,11 @@ clean:
$(Q) $(REMOVE) $(IMAGE_DIR)*.px4
.PHONY: distclean
-distclean: cleannuttxpatches clean
+distclean: clean cleannuttxpatches
@echo > /dev/null
- $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export
- $(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean
- $(Q) (cd $(NUTTX_SRC)/configs && $(FIND) . -maxdepth 1 -type l -delete)
+ $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export > /dev/null
+ $(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean > /dev/null
+ $(Q) (cd $(NUTTX_SRC)/configs && $(FIND) . -maxdepth 1 -type l -delete) > /dev/null
#
# Print some help text