diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-26 14:36:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-26 14:36:28 +0000 |
| commit | b55eb97656c92bbb5f7bce796de5084cbbc890c7 (patch) | |
| tree | fc7b9a9e3bcccfa11b7611218c9bbfb4a96f6900 /NxWidgets | |
| parent | 839a2cc356869a714978d154760fce9b55dd56ba (diff) | |
| download | px4-nuttx-b55eb97656c92bbb5f7bce796de5084cbbc890c7.tar.gz px4-nuttx-b55eb97656c92bbb5f7bce796de5084cbbc890c7.tar.bz2 px4-nuttx-b55eb97656c92bbb5f7bce796de5084cbbc890c7.zip | |
Fixes for clean compilation of NxWidgets/NxWM with Kconfig and changes to build system; Fixes to Shenzhou NxWM configuration for clean build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5193 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/Makefile | 8 | ||||
| -rw-r--r-- | NxWidgets/nxwm/Makefile | 8 |
3 files changed, 18 insertions, 0 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index e0a4c9b2e..840c0640b 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -166,3 +166,5 @@ * Kconfig: Added a mconfig configuration file. Eventually, NxWidgets needs to get hooked into the NuttX mconf configuration. Still not exactly sure how to do that. +* libnxwidgets/Makefile and NxWidgets/nxwm/Makefile: Need updates + for consistency with recent changes to NuttX build system (>= 6.22) diff --git a/NxWidgets/libnxwidgets/Makefile b/NxWidgets/libnxwidgets/Makefile index 2520e419d..0afb55e69 100644 --- a/NxWidgets/libnxwidgets/Makefile +++ b/NxWidgets/libnxwidgets/Makefile @@ -36,6 +36,14 @@ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs +# Control build verbosity + +ifeq ($(V),1) +export Q := +else +export Q := @ +endif + NXWIDGETDIR := ${shell pwd | sed -e 's/ /\\ /g'} ASRCS = diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile index e50863494..6b60327af 100644 --- a/NxWidgets/nxwm/Makefile +++ b/NxWidgets/nxwm/Makefile @@ -36,6 +36,14 @@ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs +# Control build verbosity + +ifeq ($(V),1) +export Q := +else +export Q := @ +endif + NXWMDIR := ${shell pwd | sed -e 's/ /\\ /g'} NXWIDGETDIR := $(NXWMDIR)/../libnxwidgets |