aboutsummaryrefslogtreecommitdiff
path: root/nuttx/Makefile.win
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-01-17 01:00:46 -0800
committerpx4dev <px4@purgatory.org>2013-01-17 01:00:46 -0800
commit1a532d16dd3a90f20c3668b00ea4f3a86ea32c49 (patch)
treea770db1fe91e5a3c08e4cb03b216ac36c6f7684d /nuttx/Makefile.win
parent7d7c352fb44b718cb96096a624a19b5225e39f92 (diff)
parentcaeef71797019505fd450b1a0ae573ac5e490c6e (diff)
downloadpx4-firmware-1a532d16dd3a90f20c3668b00ea4f3a86ea32c49.tar.gz
px4-firmware-1a532d16dd3a90f20c3668b00ea4f3a86ea32c49.tar.bz2
px4-firmware-1a532d16dd3a90f20c3668b00ea4f3a86ea32c49.zip
Merge NuttX r5527
Diffstat (limited to 'nuttx/Makefile.win')
-rw-r--r--nuttx/Makefile.win19
1 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win
index 34da12ad0..5c4404f57 100644
--- a/nuttx/Makefile.win
+++ b/nuttx/Makefile.win
@@ -252,7 +252,7 @@ LINKLIBS = $(patsubst lib\\%,%,$(NUTTXLIBS))
BIN = nuttx$(EXEEXT)
all: $(BIN)
-.PHONY: context clean_context check_context export subdir_clean clean subdir_distclean distclean apps_clean apps_distclean
+.PHONY: context clean_context check_context configenv config oldconfig menuconfig export subdir_clean clean subdir_distclean distclean apps_clean apps_distclean
# Target used to copy include\nuttx\math.h. If CONFIG_ARCH_MATH_H is
# defined, then there is an architecture specific math.h header file
@@ -452,7 +452,7 @@ clean_context:
# check_context
#
# This target checks if NuttX has been configured. NuttX is configured using
-# the script tools\configure.sh. That script will install certain files in
+# the script tools\configure.bat. That script will install certain files in
# the top-level NuttX build directory. This target verifies that those
# configuration files have been installed and that NuttX is ready to be built.
@@ -647,14 +647,17 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
# location: http://ymorin.is-a-geek.org/projects/kconfig-frontends. See
# misc\tools\README.txt for additional information.
-config:
- $(Q) APPSDIR=${CONFIG_APPS_DIR} conf Kconfig
+configenv:
+ $(Q) set APPSDIR=${CONFIG_APPS_DIR}
-oldconfig:
- $(Q) APPSDIR=${CONFIG_APPS_DIR} conf --oldconfig Kconfig
+config: configenv
+ $(Q) kconfig-conf Kconfig
-menuconfig:
- $(Q) APPSDIR=${CONFIG_APPS_DIR} mconf Kconfig
+oldconfig: configenv
+ $(Q) kconfig-conf --oldconfig Kconfig
+
+menuconfig: configenv
+ $(Q) kconfig-mconf Kconfig
# export
#