From bfff7dc4caec5fc62a024be052e9dcd73f52f9e5 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 15:23:50 +0200 Subject: [PATCH 01/27] add kmenu files --- canutils/Kmenu | 1 + examples/Kmenu | 1 + fsutils/Kmenu | 1 + gpsutils/Kmenu | 1 + graphics/Kmenu | 1 + interpreters/Kmenu | 1 + netutils/Kmenu | 1 + system/Kmenu | 1 + 8 files changed, 8 insertions(+) create mode 100644 canutils/Kmenu create mode 100644 examples/Kmenu create mode 100644 fsutils/Kmenu create mode 100644 gpsutils/Kmenu create mode 100644 graphics/Kmenu create mode 100644 interpreters/Kmenu create mode 100644 netutils/Kmenu create mode 100644 system/Kmenu diff --git a/canutils/Kmenu b/canutils/Kmenu new file mode 100644 index 000000000..695c934b6 --- /dev/null +++ b/canutils/Kmenu @@ -0,0 +1 @@ +CAN Utilities diff --git a/examples/Kmenu b/examples/Kmenu new file mode 100644 index 000000000..ad6b7fb4b --- /dev/null +++ b/examples/Kmenu @@ -0,0 +1 @@ +Examples diff --git a/fsutils/Kmenu b/fsutils/Kmenu new file mode 100644 index 000000000..4e61ee913 --- /dev/null +++ b/fsutils/Kmenu @@ -0,0 +1 @@ +File System Utilities diff --git a/gpsutils/Kmenu b/gpsutils/Kmenu new file mode 100644 index 000000000..3fd21d77b --- /dev/null +++ b/gpsutils/Kmenu @@ -0,0 +1 @@ +GPS Utilities diff --git a/graphics/Kmenu b/graphics/Kmenu new file mode 100644 index 000000000..453def533 --- /dev/null +++ b/graphics/Kmenu @@ -0,0 +1 @@ +Graphics Support diff --git a/interpreters/Kmenu b/interpreters/Kmenu new file mode 100644 index 000000000..ec50152c2 --- /dev/null +++ b/interpreters/Kmenu @@ -0,0 +1 @@ +Interpreters diff --git a/netutils/Kmenu b/netutils/Kmenu new file mode 100644 index 000000000..3919aa206 --- /dev/null +++ b/netutils/Kmenu @@ -0,0 +1 @@ +Network Utilities diff --git a/system/Kmenu b/system/Kmenu new file mode 100644 index 000000000..038615da8 --- /dev/null +++ b/system/Kmenu @@ -0,0 +1 @@ +System Libraries and NSH Add-Ons From 9a406515d7d099b2c2eb6622257145f0db3d45bf Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:21:21 +0200 Subject: [PATCH 02/27] make the full tree use wildcards make.defs --- graphics/Make.defs | 12 +--- graphics/screenshot/Make.defs | 39 +++++++++++ graphics/tiff/Make.defs | 39 +++++++++++ graphics/traveler/Make.defs | 40 +++++++++++ interpreters/.gitignore | 1 - interpreters/Make.defs | 16 +---- interpreters/bas/Make.defs | 4 ++ interpreters/ficl/Make.defs | 4 ++ interpreters/micropython/Make.defs | 4 ++ interpreters/pcode/Make.defs | 4 ++ netutils/Make.defs | 76 +------------------- netutils/chat/Make.defs | 40 +++++++++++ netutils/codecs/Make.defs | 39 +++++++++++ netutils/dhcpc/Make.defs | 39 +++++++++++ netutils/dhcpd/Make.defs | 39 +++++++++++ netutils/discover/Make.defs | 39 +++++++++++ netutils/esp8266/Make.defs | 39 +++++++++++ netutils/ftpc/Make.defs | 39 +++++++++++ netutils/ftpd/Make.defs | 39 +++++++++++ netutils/json/Make.defs | 39 +++++++++++ netutils/netlib/Make.defs | 39 +++++++++++ netutils/ntpclient/Make.defs | 39 +++++++++++ netutils/pppd/Make.defs | 39 +++++++++++ netutils/smtp/Make.defs | 39 +++++++++++ netutils/telnetd/Make.defs | 39 +++++++++++ netutils/tftpc/Make.defs | 39 +++++++++++ netutils/thttpd/Make.defs | 39 +++++++++++ netutils/webclient/Make.defs | 39 +++++++++++ netutils/webserver/Make.defs | 39 +++++++++++ netutils/xmlrpc/Make.defs | 39 +++++++++++ system/Make.defs | 109 +---------------------------- system/cdcacm/Make.defs | 40 +++++++++++ system/cle/Make.defs | 40 +++++++++++ system/composite/Make.defs | 40 +++++++++++ system/cu/Make.defs | 40 +++++++++++ system/flash_eraseall/Make.defs | 40 +++++++++++ system/free/Make.defs | 40 +++++++++++ system/hex2bin/Make.defs | 40 +++++++++++ system/hexed/Make.defs | 40 +++++++++++ system/i2c/Make.defs | 40 +++++++++++ system/install/Make.defs | 40 +++++++++++ system/lm75/Make.defs | 40 +++++++++++ system/mdio/Make.defs | 40 +++++++++++ system/netdb/Make.defs | 40 +++++++++++ system/nxplayer/Make.defs | 40 +++++++++++ system/prun/Make.defs | 40 +++++++++++ system/ramtest/Make.defs | 40 +++++++++++ system/readline/Make.defs | 40 +++++++++++ system/sched_note/Make.defs | 40 +++++++++++ system/stackmonitor/Make.defs | 40 +++++++++++ system/sudoku/Make.defs | 40 +++++++++++ system/symtab/Make.defs | 40 +++++++++++ system/usbmonitor/Make.defs | 40 +++++++++++ system/usbmsc/Make.defs | 40 +++++++++++ system/vi/Make.defs | 40 +++++++++++ system/zmodem/Make.defs | 40 +++++++++++ system/zoneinfo/Make.defs | 40 +++++++++++ 57 files changed, 1920 insertions(+), 210 deletions(-) create mode 100644 graphics/screenshot/Make.defs create mode 100644 graphics/tiff/Make.defs create mode 100644 graphics/traveler/Make.defs create mode 100644 interpreters/bas/Make.defs create mode 100644 interpreters/ficl/Make.defs create mode 100644 interpreters/micropython/Make.defs create mode 100644 interpreters/pcode/Make.defs create mode 100644 netutils/chat/Make.defs create mode 100644 netutils/codecs/Make.defs create mode 100644 netutils/dhcpc/Make.defs create mode 100644 netutils/dhcpd/Make.defs create mode 100644 netutils/discover/Make.defs create mode 100644 netutils/esp8266/Make.defs create mode 100644 netutils/ftpc/Make.defs create mode 100644 netutils/ftpd/Make.defs create mode 100644 netutils/json/Make.defs create mode 100644 netutils/netlib/Make.defs create mode 100644 netutils/ntpclient/Make.defs create mode 100644 netutils/pppd/Make.defs create mode 100644 netutils/smtp/Make.defs create mode 100644 netutils/telnetd/Make.defs create mode 100644 netutils/tftpc/Make.defs create mode 100644 netutils/thttpd/Make.defs create mode 100644 netutils/webclient/Make.defs create mode 100644 netutils/webserver/Make.defs create mode 100644 netutils/xmlrpc/Make.defs create mode 100644 system/cdcacm/Make.defs create mode 100644 system/cle/Make.defs create mode 100644 system/composite/Make.defs create mode 100644 system/cu/Make.defs create mode 100644 system/flash_eraseall/Make.defs create mode 100644 system/free/Make.defs create mode 100644 system/hex2bin/Make.defs create mode 100644 system/hexed/Make.defs create mode 100644 system/i2c/Make.defs create mode 100644 system/install/Make.defs create mode 100644 system/lm75/Make.defs create mode 100644 system/mdio/Make.defs create mode 100644 system/netdb/Make.defs create mode 100644 system/nxplayer/Make.defs create mode 100644 system/prun/Make.defs create mode 100644 system/ramtest/Make.defs create mode 100644 system/readline/Make.defs create mode 100644 system/sched_note/Make.defs create mode 100644 system/stackmonitor/Make.defs create mode 100644 system/sudoku/Make.defs create mode 100644 system/symtab/Make.defs create mode 100644 system/usbmonitor/Make.defs create mode 100644 system/usbmsc/Make.defs create mode 100644 system/vi/Make.defs create mode 100644 system/zmodem/Make.defs create mode 100644 system/zoneinfo/Make.defs diff --git a/graphics/Make.defs b/graphics/Make.defs index 987c387b6..15499db75 100644 --- a/graphics/Make.defs +++ b/graphics/Make.defs @@ -34,14 +34,4 @@ # ############################################################################ -ifeq ($(CONFIG_TIFF),y) -CONFIGURED_APPS += graphics/tiff -endif - -ifeq ($(CONFIG_GRAPHICS_SCREENSHOT),y) -CONFIGURED_APPS += graphics/screenshot -endif - -ifeq ($(CONFIG_GRAPHICS_TRAVELER),y) -CONFIGURED_APPS += graphics/traveler -endif +include $(wildcard graphics/*/Make.defs) diff --git a/graphics/screenshot/Make.defs b/graphics/screenshot/Make.defs new file mode 100644 index 000000000..ca52928f6 --- /dev/null +++ b/graphics/screenshot/Make.defs @@ -0,0 +1,39 @@ +############################################################################ +# apps/graphics/screenshot/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_GRAPHICS_SCREENSHOT),y) +CONFIGURED_APPS += graphics/screenshot +endif diff --git a/graphics/tiff/Make.defs b/graphics/tiff/Make.defs new file mode 100644 index 000000000..ff2795356 --- /dev/null +++ b/graphics/tiff/Make.defs @@ -0,0 +1,39 @@ +############################################################################ +# apps/graphics/tiff/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_TIFF),y) +CONFIGURED_APPS += graphics/tiff +endif diff --git a/graphics/traveler/Make.defs b/graphics/traveler/Make.defs new file mode 100644 index 000000000..4e5495d42 --- /dev/null +++ b/graphics/traveler/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/graphics/traveler/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_GRAPHICS_TRAVELER),y) +CONFIGURED_APPS += graphics/traveler +endif + diff --git a/interpreters/.gitignore b/interpreters/.gitignore index bee9a7372..e69de29bb 100644 --- a/interpreters/.gitignore +++ b/interpreters/.gitignore @@ -1 +0,0 @@ -/pcode diff --git a/interpreters/Make.defs b/interpreters/Make.defs index 98a675ee3..7893b58e7 100644 --- a/interpreters/Make.defs +++ b/interpreters/Make.defs @@ -34,18 +34,4 @@ # ############################################################################ -ifeq ($(CONFIG_INTERPRETERS_BAS),y) -CONFIGURED_APPS += interpreters/bas -endif - -ifeq ($(CONFIG_INTERPRETERS_FICL),y) -CONFIGURED_APPS += interpreters/ficl -endif - -ifeq ($(CONFIG_INTERPRETERS_MICROPYTHON),y) -CONFIGURED_APPS += interpreters/micropython -endif - -ifeq ($(CONFIG_INTERPRETERS_PCODE),y) -CONFIGURED_APPS += interpreters/pcode -endif +include $(wildcard interpreters/*/Make.defs) diff --git a/interpreters/bas/Make.defs b/interpreters/bas/Make.defs new file mode 100644 index 000000000..e5175ae00 --- /dev/null +++ b/interpreters/bas/Make.defs @@ -0,0 +1,4 @@ +ifeq ($(CONFIG_INTERPRETERS_BAS),y) +CONFIGURED_APPS += interpreters/bas +endif + diff --git a/interpreters/ficl/Make.defs b/interpreters/ficl/Make.defs new file mode 100644 index 000000000..ec8c3f4c1 --- /dev/null +++ b/interpreters/ficl/Make.defs @@ -0,0 +1,4 @@ +ifeq ($(CONFIG_INTERPRETERS_FICL),y) +CONFIGURED_APPS += interpreters/ficl +endif + diff --git a/interpreters/micropython/Make.defs b/interpreters/micropython/Make.defs new file mode 100644 index 000000000..aa2888a83 --- /dev/null +++ b/interpreters/micropython/Make.defs @@ -0,0 +1,4 @@ +ifeq ($(CONFIG_INTERPRETERS_MICROPYTHON),y) +CONFIGURED_APPS += interpreters/micropython +endif + diff --git a/interpreters/pcode/Make.defs b/interpreters/pcode/Make.defs new file mode 100644 index 000000000..f4ccce58c --- /dev/null +++ b/interpreters/pcode/Make.defs @@ -0,0 +1,4 @@ +ifeq ($(CONFIG_INTERPRETERS_PCODE),y) +CONFIGURED_APPS += interpreters/pcode +endif + diff --git a/netutils/Make.defs b/netutils/Make.defs index d03af9969..58443df23 100644 --- a/netutils/Make.defs +++ b/netutils/Make.defs @@ -34,78 +34,4 @@ # ############################################################################ -ifeq ($(CONFIG_NETUTILS_CHAT),y) -CONFIGURED_APPS += netutils/chat -endif - -ifeq ($(CONFIG_NETUTILS_CODECS),y) -CONFIGURED_APPS += netutils/codecs -endif - -ifeq ($(CONFIG_NETUTILS_DHCPC),y) -CONFIGURED_APPS += netutils/dhcpc -endif - -ifeq ($(CONFIG_NETUTILS_DHCPD),y) -CONFIGURED_APPS += netutils/dhcpd -endif - -ifeq ($(CONFIG_NETUTILS_ESP8266),y) -CONFIGURED_APPS += netutils/esp8266 -endif - -ifeq ($(CONFIG_NETUTILS_FTPC),y) -CONFIGURED_APPS += netutils/ftpc -endif - -ifeq ($(CONFIG_NETUTILS_FTPD),y) -CONFIGURED_APPS += netutils/ftpd -endif - -ifeq ($(CONFIG_NETUTILS_JSON),y) -CONFIGURED_APPS += netutils/json -endif - -ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y) -CONFIGURED_APPS += netutils/ntpclient -endif - -ifeq ($(CONFIG_NETUTILS_PPPD),y) -CONFIGURED_APPS += netutils/pppd -endif - -ifeq ($(CONFIG_NETUTILS_SMTP),y) -CONFIGURED_APPS += netutils/smtp -endif - -ifeq ($(CONFIG_NETUTILS_TELNETD),y) -CONFIGURED_APPS += netutils/telnetd -endif - -ifeq ($(CONFIG_NETUTILS_TFTPC),y) -CONFIGURED_APPS += netutils/tftpc -endif - -ifeq ($(CONFIG_NETUTILS_THTTPD),y) -CONFIGURED_APPS += netutils/thttpd -endif - -ifeq ($(CONFIG_NETUTILS_NETLIB),y) -CONFIGURED_APPS += netutils/netlib -endif - -ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y) -CONFIGURED_APPS += netutils/webclient -endif - -ifeq ($(CONFIG_NETUTILS_WEBSERVER),y) -CONFIGURED_APPS += netutils/webserver -endif - -ifeq ($(CONFIG_NETUTILS_DISCOVER),y) -CONFIGURED_APPS += netutils/discover -endif - -ifeq ($(CONFIG_NETUTILS_XMLRPC),y) -CONFIGURED_APPS += netutils/xmlrpc -endif +include $(wildcard netutils/*/Make.defs) diff --git a/netutils/chat/Make.defs b/netutils/chat/Make.defs new file mode 100644 index 000000000..540388363 --- /dev/null +++ b/netutils/chat/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/netutils/chat/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_CHAT),y) +CONFIGURED_APPS += netutils/chat +endif + diff --git a/netutils/codecs/Make.defs b/netutils/codecs/Make.defs new file mode 100644 index 000000000..73b984c36 --- /dev/null +++ b/netutils/codecs/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/codecs/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_CODECS),y) +CONFIGURED_APPS += netutils/codecs +endif + diff --git a/netutils/dhcpc/Make.defs b/netutils/dhcpc/Make.defs new file mode 100644 index 000000000..4a60fc4eb --- /dev/null +++ b/netutils/dhcpc/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/dhcpc/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_DHCPC),y) +CONFIGURED_APPS += netutils/dhcpc +endif + diff --git a/netutils/dhcpd/Make.defs b/netutils/dhcpd/Make.defs new file mode 100644 index 000000000..a2c0611be --- /dev/null +++ b/netutils/dhcpd/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/dhcpd/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_DHCPD),y) +CONFIGURED_APPS += netutils/dhcpd +endif + diff --git a/netutils/discover/Make.defs b/netutils/discover/Make.defs new file mode 100644 index 000000000..5db6699a9 --- /dev/null +++ b/netutils/discover/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/discover/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_DISCOVER),y) +CONFIGURED_APPS += netutils/discover +endif + diff --git a/netutils/esp8266/Make.defs b/netutils/esp8266/Make.defs new file mode 100644 index 000000000..7b61e3046 --- /dev/null +++ b/netutils/esp8266/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/esp8266/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_ESP8266),y) +CONFIGURED_APPS += netutils/esp8266 +endif + diff --git a/netutils/ftpc/Make.defs b/netutils/ftpc/Make.defs new file mode 100644 index 000000000..166aecc15 --- /dev/null +++ b/netutils/ftpc/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/ftpc/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_FTPC),y) +CONFIGURED_APPS += netutils/ftpc +endif + diff --git a/netutils/ftpd/Make.defs b/netutils/ftpd/Make.defs new file mode 100644 index 000000000..82ea6bd5d --- /dev/null +++ b/netutils/ftpd/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/ftpd/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_FTPD),y) +CONFIGURED_APPS += netutils/ftpd +endif + diff --git a/netutils/json/Make.defs b/netutils/json/Make.defs new file mode 100644 index 000000000..f60652fbb --- /dev/null +++ b/netutils/json/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/json/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_JSON),y) +CONFIGURED_APPS += netutils/json +endif + diff --git a/netutils/netlib/Make.defs b/netutils/netlib/Make.defs new file mode 100644 index 000000000..e9d4252e4 --- /dev/null +++ b/netutils/netlib/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/netlib/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_NETLIB),y) +CONFIGURED_APPS += netutils/netlib +endif + diff --git a/netutils/ntpclient/Make.defs b/netutils/ntpclient/Make.defs new file mode 100644 index 000000000..f2dabeca4 --- /dev/null +++ b/netutils/ntpclient/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/ntpclient/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y) +CONFIGURED_APPS += netutils/ntpclient +endif + diff --git a/netutils/pppd/Make.defs b/netutils/pppd/Make.defs new file mode 100644 index 000000000..61699d441 --- /dev/null +++ b/netutils/pppd/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/pppd/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_PPPD),y) +CONFIGURED_APPS += netutils/pppd +endif + diff --git a/netutils/smtp/Make.defs b/netutils/smtp/Make.defs new file mode 100644 index 000000000..a40e29b20 --- /dev/null +++ b/netutils/smtp/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/smtp/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_SMTP),y) +CONFIGURED_APPS += netutils/smtp +endif + diff --git a/netutils/telnetd/Make.defs b/netutils/telnetd/Make.defs new file mode 100644 index 000000000..a95c79615 --- /dev/null +++ b/netutils/telnetd/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/telnetd/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_TELNETD),y) +CONFIGURED_APPS += netutils/telnetd +endif + diff --git a/netutils/tftpc/Make.defs b/netutils/tftpc/Make.defs new file mode 100644 index 000000000..3b9436917 --- /dev/null +++ b/netutils/tftpc/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/tftpc/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_TFTPC),y) +CONFIGURED_APPS += netutils/tftpc +endif + diff --git a/netutils/thttpd/Make.defs b/netutils/thttpd/Make.defs new file mode 100644 index 000000000..a6d0c2e48 --- /dev/null +++ b/netutils/thttpd/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/thttpd/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_THTTPD),y) +CONFIGURED_APPS += netutils/thttpd +endif + diff --git a/netutils/webclient/Make.defs b/netutils/webclient/Make.defs new file mode 100644 index 000000000..2e2bbf9cb --- /dev/null +++ b/netutils/webclient/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/webclient/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y) +CONFIGURED_APPS += netutils/webclient +endif + diff --git a/netutils/webserver/Make.defs b/netutils/webserver/Make.defs new file mode 100644 index 000000000..0ccea3061 --- /dev/null +++ b/netutils/webserver/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/webserver/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_WEBSERVER),y) +CONFIGURED_APPS += netutils/webserver +endif + diff --git a/netutils/xmlrpc/Make.defs b/netutils/xmlrpc/Make.defs new file mode 100644 index 000000000..776efb18b --- /dev/null +++ b/netutils/xmlrpc/Make.defs @@ -0,0 +1,39 @@ +# apps/netutils/xmlrpc/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NETUTILS_XMLRPC),y) +CONFIGURED_APPS += netutils/xmlrpc +endif + diff --git a/system/Make.defs b/system/Make.defs index 984d9f670..a54e610a1 100644 --- a/system/Make.defs +++ b/system/Make.defs @@ -34,111 +34,4 @@ # ############################################################################ -ifeq ($(CONFIG_SYSTEM_CDCACM),y) -CONFIGURED_APPS += system/cdcacm -endif - -ifeq ($(CONFIG_SYSTEM_CLE),y) -CONFIGURED_APPS += system/cle -endif - -ifeq ($(CONFIG_SYSTEM_COMPOSITE),y) -CONFIGURED_APPS += system/composite -endif - -ifeq ($(CONFIG_SYSTEM_CUTERM),y) -CONFIGURED_APPS += system/cu -endif - -ifeq ($(CONFIG_SYSTEM_FREE),y) -CONFIGURED_APPS += system/free -endif - -ifeq ($(CONFIG_SYSTEM_HEX2BIN),y) -CONFIGURED_APPS += system/hex2bin -endif - -ifeq ($(CONFIG_SYSTEM_HEXED),y) -CONFIGURED_APPS += system/hexed -endif - -ifeq ($(CONFIG_SYSTEM_I2CTOOL),y) -CONFIGURED_APPS += system/i2c -endif - -ifeq ($(CONFIG_SYSTEM_INSTALL),y) -CONFIGURED_APPS += system/install -endif - -ifeq ($(CONFIG_SYSTEM_FLASH_ERASEALL),y) -CONFIGURED_APPS += system/flash_eraseall -endif - -ifeq ($(CONFIG_SYSTEM_LM75),y) -CONFIGURED_APPS += system/lm75 -endif - -ifeq ($(CONFIG_SYSTEM_NETDB),y) -CONFIGURED_APPS += system/netdb -endif - -ifeq ($(CONFIG_SYSTEM_NXPLAYER),y) -CONFIGURED_APPS += system/nxplayer -endif - -ifeq ($(CONFIG_SYSTEM_PRUN),y) -CONFIGURED_APPS += system/prun -endif - -ifeq ($(CONFIG_SYSTEM_MDIO),y) -CONFIGURED_APPS += system/mdio -endif - -ifeq ($(CONFIG_SYSTEM_RAMTEST),y) -CONFIGURED_APPS += system/ramtest -endif - -ifeq ($(CONFIG_SYSTEM_READLINE),y) -CONFIGURED_APPS += system/readline -endif - -ifeq ($(CONFIG_SYSTEM_NOTE),y) -CONFIGURED_APPS += system/sched_note -endif - -ifeq ($(CONFIG_SYSTEM_SUDOKU),y) -CONFIGURED_APPS += system/sudoku -endif - -ifeq ($(CONFIG_SYSTEM_STACKMONITOR),y) -CONFIGURED_APPS += system/stackmonitor -endif - -ifeq ($(CONFIG_SYSTEM_SYMTAB),y) -CONFIGURED_APPS += system/symtab -endif - -ifeq ($(CONFIG_SYSTEM_UBLOXMODEM),y) -CONFIGURED_APPS += system/ubloxmodem -endif - -ifeq ($(CONFIG_SYSTEM_USBMONITOR),y) -CONFIGURED_APPS += system/usbmonitor -endif - -ifeq ($(CONFIG_SYSTEM_USBMSC),y) -CONFIGURED_APPS += system/usbmsc -endif - -ifeq ($(CONFIG_SYSTEM_VI),y) -CONFIGURED_APPS += system/vi -endif - -ifeq ($(CONFIG_SYSTEM_ZMODEM),y) -CONFIGURED_APPS += system/zmodem -endif - -ifeq ($(CONFIG_SYSTEM_ZONEINFO),y) -CONFIGURED_APPS += system/zoneinfo -endif - +include $(wildcard system/*/Make.defs) diff --git a/system/cdcacm/Make.defs b/system/cdcacm/Make.defs new file mode 100644 index 000000000..0e58498c8 --- /dev/null +++ b/system/cdcacm/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/cdcacm/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_CDCACM),y) +CONFIGURED_APPS += system/cdcacm +endif + diff --git a/system/cle/Make.defs b/system/cle/Make.defs new file mode 100644 index 000000000..6ffd966b1 --- /dev/null +++ b/system/cle/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/cle/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_CLE),y) +CONFIGURED_APPS += system/cle +endif + diff --git a/system/composite/Make.defs b/system/composite/Make.defs new file mode 100644 index 000000000..1cdd2d24d --- /dev/null +++ b/system/composite/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/composite/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_COMPOSITE),y) +CONFIGURED_APPS += system/composite +endif + diff --git a/system/cu/Make.defs b/system/cu/Make.defs new file mode 100644 index 000000000..f67b6d10a --- /dev/null +++ b/system/cu/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/cu/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_CUTERM),y) +CONFIGURED_APPS += system/cu +endif + diff --git a/system/flash_eraseall/Make.defs b/system/flash_eraseall/Make.defs new file mode 100644 index 000000000..bd1c8a501 --- /dev/null +++ b/system/flash_eraseall/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/flash_eraseall/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_FLASH_ERASEALL),y) +CONFIGURED_APPS += system/flash_eraseall +endif + diff --git a/system/free/Make.defs b/system/free/Make.defs new file mode 100644 index 000000000..5935b0a48 --- /dev/null +++ b/system/free/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/free/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_FREE),y) +CONFIGURED_APPS += system/free +endif + diff --git a/system/hex2bin/Make.defs b/system/hex2bin/Make.defs new file mode 100644 index 000000000..d89cd2341 --- /dev/null +++ b/system/hex2bin/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/hex2bin/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_HEX2BIN),y) +CONFIGURED_APPS += system/hex2bin +endif + diff --git a/system/hexed/Make.defs b/system/hexed/Make.defs new file mode 100644 index 000000000..f47238fe2 --- /dev/null +++ b/system/hexed/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/hexed/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_HEXED),y) +CONFIGURED_APPS += system/hexed +endif + diff --git a/system/i2c/Make.defs b/system/i2c/Make.defs new file mode 100644 index 000000000..d9cbd061c --- /dev/null +++ b/system/i2c/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/i2c/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2015 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_I2CTOOL),y) +CONFIGURED_APPS += system/i2c +endif + diff --git a/system/install/Make.defs b/system/install/Make.defs new file mode 100644 index 000000000..d238d610c --- /dev/null +++ b/system/install/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/install/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2015 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_INSTALL),y) +CONFIGURED_APPS += system/install +endif + diff --git a/system/lm75/Make.defs b/system/lm75/Make.defs new file mode 100644 index 000000000..fff78f04e --- /dev/null +++ b/system/lm75/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/lm75/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_LM75),y) +CONFIGURED_APPS += system/lm75 +endif + diff --git a/system/mdio/Make.defs b/system/mdio/Make.defs new file mode 100644 index 000000000..6868d7c9c --- /dev/null +++ b/system/mdio/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/mdio/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_MDIO),y) +CONFIGURED_APPS += system/mdio +endif + diff --git a/system/netdb/Make.defs b/system/netdb/Make.defs new file mode 100644 index 000000000..91d532649 --- /dev/null +++ b/system/netdb/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/netdb/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_NETDB),y) +CONFIGURED_APPS += system/netdb +endif + diff --git a/system/nxplayer/Make.defs b/system/nxplayer/Make.defs new file mode 100644 index 000000000..c3f912559 --- /dev/null +++ b/system/nxplayer/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/nxplayer/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_NXPLAYER),y) +CONFIGURED_APPS += system/nxplayer +endif + diff --git a/system/prun/Make.defs b/system/prun/Make.defs new file mode 100644 index 000000000..06ab6b63c --- /dev/null +++ b/system/prun/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/prun/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_PRUN),y) +CONFIGURED_APPS += system/prun +endif + diff --git a/system/ramtest/Make.defs b/system/ramtest/Make.defs new file mode 100644 index 000000000..3b192bdc0 --- /dev/null +++ b/system/ramtest/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/ramtest/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_RAMTEST),y) +CONFIGURED_APPS += system/ramtest +endif + diff --git a/system/readline/Make.defs b/system/readline/Make.defs new file mode 100644 index 000000000..7baaf41e0 --- /dev/null +++ b/system/readline/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/readline/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_READLINE),y) +CONFIGURED_APPS += system/readline +endif + diff --git a/system/sched_note/Make.defs b/system/sched_note/Make.defs new file mode 100644 index 000000000..8f998fe6f --- /dev/null +++ b/system/sched_note/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/sched_note/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_NOTE),y) +CONFIGURED_APPS += system/sched_note +endif + diff --git a/system/stackmonitor/Make.defs b/system/stackmonitor/Make.defs new file mode 100644 index 000000000..85da0edfb --- /dev/null +++ b/system/stackmonitor/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/stackmonitor/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_STACKMONITOR),y) +CONFIGURED_APPS += system/stackmonitor +endif + diff --git a/system/sudoku/Make.defs b/system/sudoku/Make.defs new file mode 100644 index 000000000..0695a50c5 --- /dev/null +++ b/system/sudoku/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/sudoku/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_SUDOKU),y) +CONFIGURED_APPS += system/sudoku +endif + diff --git a/system/symtab/Make.defs b/system/symtab/Make.defs new file mode 100644 index 000000000..5985029e4 --- /dev/null +++ b/system/symtab/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/symtab/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_SYMTAB),y) +CONFIGURED_APPS += system/symtab +endif + diff --git a/system/usbmonitor/Make.defs b/system/usbmonitor/Make.defs new file mode 100644 index 000000000..fe2eecd6b --- /dev/null +++ b/system/usbmonitor/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/usbmonitor/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_USBMONITOR),y) +CONFIGURED_APPS += system/usbmonitor +endif + diff --git a/system/usbmsc/Make.defs b/system/usbmsc/Make.defs new file mode 100644 index 000000000..a4cb9065d --- /dev/null +++ b/system/usbmsc/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/usbmsc/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_USBMSC),y) +CONFIGURED_APPS += system/usbmsc +endif + diff --git a/system/vi/Make.defs b/system/vi/Make.defs new file mode 100644 index 000000000..8cd14add9 --- /dev/null +++ b/system/vi/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/vi/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_VI),y) +CONFIGURED_APPS += system/vi +endif + diff --git a/system/zmodem/Make.defs b/system/zmodem/Make.defs new file mode 100644 index 000000000..355627776 --- /dev/null +++ b/system/zmodem/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/zmodem/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_ZMODEM),y) +CONFIGURED_APPS += system/zmodem +endif + diff --git a/system/zoneinfo/Make.defs b/system/zoneinfo/Make.defs new file mode 100644 index 000000000..a3732808a --- /dev/null +++ b/system/zoneinfo/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/zoneinfo/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2016 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_ZONEINFO),y) +CONFIGURED_APPS += system/zoneinfo +endif + From bfff5e7179ce9e0116f88f2c7171899936fb2156 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:24:30 +0200 Subject: [PATCH 03/27] Add empty preconfig rules to 'leaf' makefiles --- builtin/Makefile | 2 ++ canutils/libcanard/Makefile | 2 ++ canutils/libuavcan/Makefile | 2 ++ examples/bastest/Makefile | 2 ++ examples/bridge/Makefile | 2 ++ examples/cc3000/Makefile | 2 ++ examples/chat/Makefile | 2 ++ examples/elf/Makefile | 2 ++ examples/ftpd/Makefile | 2 ++ examples/module/Makefile | 2 ++ examples/nettest/Makefile | 2 ++ examples/nxflat/Makefile | 2 ++ examples/poll/Makefile | 2 ++ examples/posix_spawn/Makefile | 2 ++ examples/romfs/Makefile | 2 ++ examples/thttpd/Makefile | 2 ++ examples/tiff/Makefile | 2 ++ examples/udgram/Makefile | 2 ++ examples/udp/Makefile | 2 ++ examples/udpblaster/Makefile | 2 ++ examples/unionfs/Makefile | 2 ++ examples/usbserial/Makefile | 2 ++ examples/ustream/Makefile | 2 ++ examples/webserver/Makefile | 2 ++ fsutils/inifile/Makefile | 2 ++ fsutils/mksmartfs/Makefile | 2 ++ fsutils/passwd/Makefile | 2 ++ gpsutils/minmea/Makefile | 2 ++ graphics/screenshot/Makefile | 2 ++ graphics/tiff/Makefile | 2 ++ graphics/traveler/Makefile | 2 ++ interpreters/bas/Makefile | 2 ++ interpreters/ficl/Makefile | 2 ++ interpreters/micropython/Makefile | 2 ++ modbus/Makefile | 2 ++ netutils/chat/Makefile | 2 ++ netutils/codecs/Makefile | 2 ++ netutils/dhcpc/Makefile | 2 ++ netutils/dhcpd/Makefile | 2 ++ netutils/discover/Makefile | 2 ++ netutils/esp8266/Makefile | 2 ++ netutils/ftpc/Makefile | 2 ++ netutils/ftpd/Makefile | 2 ++ netutils/json/Makefile | 2 ++ netutils/netlib/Makefile | 2 ++ netutils/ntpclient/Makefile | 2 ++ netutils/ping/Makefile | 2 ++ netutils/pppd/Makefile | 2 ++ netutils/smtp/Makefile | 2 ++ netutils/telnetd/Makefile | 2 ++ netutils/tftpc/Makefile | 2 ++ netutils/thttpd/Makefile | 2 ++ netutils/webclient/Makefile | 2 ++ netutils/webserver/Makefile | 2 ++ netutils/xmlrpc/Makefile | 2 ++ nshlib/Makefile | 2 ++ platform/Makefile | 2 ++ system/cdcacm/Makefile | 2 ++ system/cle/Makefile | 2 ++ system/composite/Makefile | 2 ++ system/cu/Makefile | 2 ++ system/flash_eraseall/Makefile | 4 +++- system/free/Makefile | 2 ++ system/hex2bin/Makefile | 2 ++ system/hexed/Makefile | 2 ++ system/i2c/Makefile | 2 ++ system/install/Makefile | 2 ++ system/lm75/Makefile | 2 ++ system/mdio/Makefile | 2 ++ system/netdb/Makefile | 2 ++ system/nxplayer/Makefile | 2 ++ system/prun/Makefile | 2 ++ system/ramtest/Makefile | 4 +++- system/readline/Makefile | 2 ++ system/sched_note/Makefile | 2 +- system/stackmonitor/Makefile | 2 ++ system/sudoku/Makefile | 2 ++ system/symtab/Makefile | 4 +++- system/ubloxmodem/Makefile | 2 ++ system/usbmonitor/Makefile | 2 ++ system/usbmsc/Makefile | 2 ++ system/vi/Makefile | 2 ++ system/zmodem/Makefile | 2 ++ system/zoneinfo/Makefile | 3 +++ 84 files changed, 171 insertions(+), 4 deletions(-) diff --git a/builtin/Makefile b/builtin/Makefile index 29f828dc7..6af1922ad 100644 --- a/builtin/Makefile +++ b/builtin/Makefile @@ -136,3 +136,5 @@ distclean: clean $(call DELFILE, builtin_proto.h) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/canutils/libcanard/Makefile b/canutils/libcanard/Makefile index 79c2bb853..9f15c15f3 100644 --- a/canutils/libcanard/Makefile +++ b/canutils/libcanard/Makefile @@ -109,3 +109,5 @@ distclean: clean $(call DELFILE, $(LIBCANARD_PACKNAME)) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/canutils/libuavcan/Makefile b/canutils/libuavcan/Makefile index 05fc45f61..b1d52eac7 100644 --- a/canutils/libuavcan/Makefile +++ b/canutils/libuavcan/Makefile @@ -262,3 +262,5 @@ distclean: clean $(call DELFILE, $(PYUAVCAN_PACKNAME)) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/bastest/Makefile b/examples/bastest/Makefile index f6f788570..0269b1015 100644 --- a/examples/bastest/Makefile +++ b/examples/bastest/Makefile @@ -157,3 +157,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/bridge/Makefile b/examples/bridge/Makefile index 345d080f5..da45bc5ea 100644 --- a/examples/bridge/Makefile +++ b/examples/bridge/Makefile @@ -166,3 +166,5 @@ distclean: clean $(call DELFILE, bridge_config.h) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/cc3000/Makefile b/examples/cc3000/Makefile index fa385a81e..be6943860 100644 --- a/examples/cc3000/Makefile +++ b/examples/cc3000/Makefile @@ -154,3 +154,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/chat/Makefile b/examples/chat/Makefile index 811e80291..e5031e729 100644 --- a/examples/chat/Makefile +++ b/examples/chat/Makefile @@ -130,3 +130,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/elf/Makefile b/examples/elf/Makefile index c813e1eb1..78834c7de 100644 --- a/examples/elf/Makefile +++ b/examples/elf/Makefile @@ -136,3 +136,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/ftpd/Makefile b/examples/ftpd/Makefile index 0675f0a46..74c0788b5 100644 --- a/examples/ftpd/Makefile +++ b/examples/ftpd/Makefile @@ -133,3 +133,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/module/Makefile b/examples/module/Makefile index 680b6e58c..bc1bf23c6 100644 --- a/examples/module/Makefile +++ b/examples/module/Makefile @@ -153,3 +153,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index fbefe3701..08a6a8737 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -187,3 +187,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile index ccc7d4c97..33f766684 100644 --- a/examples/nxflat/Makefile +++ b/examples/nxflat/Makefile @@ -127,3 +127,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/poll/Makefile b/examples/poll/Makefile index 092945e85..43540a5d4 100644 --- a/examples/poll/Makefile +++ b/examples/poll/Makefile @@ -125,3 +125,5 @@ distclean: clean $(call DELFILE, *.dSYM) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile index 2227e0958..9d8c87b18 100644 --- a/examples/posix_spawn/Makefile +++ b/examples/posix_spawn/Makefile @@ -156,3 +156,5 @@ spawn_main.o: spawn_main.c \ symtab.o: filesystem/symtab.c \ $(TOPDIR)/include/nuttx/compiler.h \ $(TOPDIR)/include/nuttx/binfmt/symtab.h +.PHONY: preconfig +preconfig: diff --git a/examples/romfs/Makefile b/examples/romfs/Makefile index a6873c8a1..baa56436c 100644 --- a/examples/romfs/Makefile +++ b/examples/romfs/Makefile @@ -153,3 +153,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile index be777fcf1..1b1cafc1a 100644 --- a/examples/thttpd/Makefile +++ b/examples/thttpd/Makefile @@ -137,3 +137,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/tiff/Makefile b/examples/tiff/Makefile index 28078595f..9aa4efd0c 100644 --- a/examples/tiff/Makefile +++ b/examples/tiff/Makefile @@ -138,3 +138,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/udgram/Makefile b/examples/udgram/Makefile index a6903f8ce..09da3f620 100644 --- a/examples/udgram/Makefile +++ b/examples/udgram/Makefile @@ -179,3 +179,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/udp/Makefile b/examples/udp/Makefile index 0ac348fba..3603ee0c3 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -158,3 +158,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/udpblaster/Makefile b/examples/udpblaster/Makefile index 654a914a9..f014d68fc 100644 --- a/examples/udpblaster/Makefile +++ b/examples/udpblaster/Makefile @@ -167,3 +167,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/unionfs/Makefile b/examples/unionfs/Makefile index 6eed24c52..2bffcda91 100644 --- a/examples/unionfs/Makefile +++ b/examples/unionfs/Makefile @@ -157,3 +157,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/usbserial/Makefile b/examples/usbserial/Makefile index 3b8444449..6fec07d81 100644 --- a/examples/usbserial/Makefile +++ b/examples/usbserial/Makefile @@ -135,3 +135,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/ustream/Makefile b/examples/ustream/Makefile index b5570cbe3..9d559ef62 100644 --- a/examples/ustream/Makefile +++ b/examples/ustream/Makefile @@ -171,3 +171,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/examples/webserver/Makefile b/examples/webserver/Makefile index 3f4b1c1bb..b4e77de3b 100644 --- a/examples/webserver/Makefile +++ b/examples/webserver/Makefile @@ -140,3 +140,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/fsutils/inifile/Makefile b/fsutils/inifile/Makefile index 9bf948f6e..a19fa902f 100644 --- a/fsutils/inifile/Makefile +++ b/fsutils/inifile/Makefile @@ -96,3 +96,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/fsutils/mksmartfs/Makefile b/fsutils/mksmartfs/Makefile index 9e4d06588..6a8582ff5 100644 --- a/fsutils/mksmartfs/Makefile +++ b/fsutils/mksmartfs/Makefile @@ -102,3 +102,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/fsutils/passwd/Makefile b/fsutils/passwd/Makefile index a64daa69a..13c2bd05c 100644 --- a/fsutils/passwd/Makefile +++ b/fsutils/passwd/Makefile @@ -108,3 +108,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/gpsutils/minmea/Makefile b/gpsutils/minmea/Makefile index d522f536f..541124121 100644 --- a/gpsutils/minmea/Makefile +++ b/gpsutils/minmea/Makefile @@ -97,3 +97,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile index 87f8674ad..1c2789b06 100644 --- a/graphics/screenshot/Makefile +++ b/graphics/screenshot/Makefile @@ -139,3 +139,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index bc109bd5d..ee09e12bf 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -96,3 +96,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/graphics/traveler/Makefile b/graphics/traveler/Makefile index 54454fa9f..ecbd0e54a 100644 --- a/graphics/traveler/Makefile +++ b/graphics/traveler/Makefile @@ -183,3 +183,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile index 9f8e3e23a..0ef548393 100644 --- a/interpreters/bas/Makefile +++ b/interpreters/bas/Makefile @@ -120,3 +120,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile index 958b5f84c..a97bf1b89 100644 --- a/interpreters/ficl/Makefile +++ b/interpreters/ficl/Makefile @@ -118,3 +118,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/interpreters/micropython/Makefile b/interpreters/micropython/Makefile index 1fdc67676..48b78b044 100644 --- a/interpreters/micropython/Makefile +++ b/interpreters/micropython/Makefile @@ -182,3 +182,5 @@ distclean: clean -include $(MICROPYTHON_SRCDIR)/mkrules.mk -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/modbus/Makefile b/modbus/Makefile index 9ed7dc967..78b8d60e9 100644 --- a/modbus/Makefile +++ b/modbus/Makefile @@ -119,3 +119,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/chat/Makefile b/netutils/chat/Makefile index 42c3972f0..475ee5f13 100644 --- a/netutils/chat/Makefile +++ b/netutils/chat/Makefile @@ -96,3 +96,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/codecs/Makefile b/netutils/codecs/Makefile index 3d77f47fe..d75df86a7 100644 --- a/netutils/codecs/Makefile +++ b/netutils/codecs/Makefile @@ -94,3 +94,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/dhcpc/Makefile b/netutils/dhcpc/Makefile index ffa88a9e8..33ef5f49d 100644 --- a/netutils/dhcpc/Makefile +++ b/netutils/dhcpc/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/dhcpd/Makefile b/netutils/dhcpd/Makefile index 7fb52b33d..cd4ca87cd 100644 --- a/netutils/dhcpd/Makefile +++ b/netutils/dhcpd/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/discover/Makefile b/netutils/discover/Makefile index 4337e9ed7..69dc1e6c5 100644 --- a/netutils/discover/Makefile +++ b/netutils/discover/Makefile @@ -103,3 +103,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/esp8266/Makefile b/netutils/esp8266/Makefile index 7aac00a5a..f9814c5ed 100644 --- a/netutils/esp8266/Makefile +++ b/netutils/esp8266/Makefile @@ -96,3 +96,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/ftpc/Makefile b/netutils/ftpc/Makefile index a0075f58e..18714156e 100644 --- a/netutils/ftpc/Makefile +++ b/netutils/ftpc/Makefile @@ -116,3 +116,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/ftpd/Makefile b/netutils/ftpd/Makefile index 6fb76ba8d..b1195f9d4 100644 --- a/netutils/ftpd/Makefile +++ b/netutils/ftpd/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/json/Makefile b/netutils/json/Makefile index 44237d238..1f38e3de8 100644 --- a/netutils/json/Makefile +++ b/netutils/json/Makefile @@ -94,3 +94,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile index ddf54a32b..b066db72f 100644 --- a/netutils/netlib/Makefile +++ b/netutils/netlib/Makefile @@ -142,3 +142,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/ntpclient/Makefile b/netutils/ntpclient/Makefile index 79014d5a8..a141d0379 100755 --- a/netutils/ntpclient/Makefile +++ b/netutils/ntpclient/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/ping/Makefile b/netutils/ping/Makefile index d195ef1fc..d35650eba 100644 --- a/netutils/ping/Makefile +++ b/netutils/ping/Makefile @@ -104,3 +104,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/pppd/Makefile b/netutils/pppd/Makefile index a228c2a7f..ca9eff13e 100644 --- a/netutils/pppd/Makefile +++ b/netutils/pppd/Makefile @@ -99,3 +99,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/smtp/Makefile b/netutils/smtp/Makefile index 450fafab0..68db15d49 100644 --- a/netutils/smtp/Makefile +++ b/netutils/smtp/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/telnetd/Makefile b/netutils/telnetd/Makefile index ccfc4f88a..8c79aae7c 100644 --- a/netutils/telnetd/Makefile +++ b/netutils/telnetd/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/tftpc/Makefile b/netutils/tftpc/Makefile index b629978a5..c65873da1 100644 --- a/netutils/tftpc/Makefile +++ b/netutils/tftpc/Makefile @@ -102,3 +102,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/thttpd/Makefile b/netutils/thttpd/Makefile index b78f2ae5d..57425ec2e 100644 --- a/netutils/thttpd/Makefile +++ b/netutils/thttpd/Makefile @@ -188,3 +188,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/webclient/Makefile b/netutils/webclient/Makefile index 10dd2c1eb..3fe6c6458 100644 --- a/netutils/webclient/Makefile +++ b/netutils/webclient/Makefile @@ -100,3 +100,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/webserver/Makefile b/netutils/webserver/Makefile index 47fd1047a..bca1a75ab 100644 --- a/netutils/webserver/Makefile +++ b/netutils/webserver/Makefile @@ -107,3 +107,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/netutils/xmlrpc/Makefile b/netutils/xmlrpc/Makefile index bcd17b7a6..51f28f884 100644 --- a/netutils/xmlrpc/Makefile +++ b/netutils/xmlrpc/Makefile @@ -101,3 +101,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/nshlib/Makefile b/nshlib/Makefile index 553e1bc40..5675d2ce2 100644 --- a/nshlib/Makefile +++ b/nshlib/Makefile @@ -178,3 +178,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/platform/Makefile b/platform/Makefile index a6f030a89..07083810e 100644 --- a/platform/Makefile +++ b/platform/Makefile @@ -150,3 +150,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/cdcacm/Makefile b/system/cdcacm/Makefile index fe5207eda..c0a5e6395 100644 --- a/system/cdcacm/Makefile +++ b/system/cdcacm/Makefile @@ -143,3 +143,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/cle/Makefile b/system/cle/Makefile index 33fd03afa..1d6cd90ee 100644 --- a/system/cle/Makefile +++ b/system/cle/Makefile @@ -103,3 +103,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/composite/Makefile b/system/composite/Makefile index 50819b772..7d03bf75a 100644 --- a/system/composite/Makefile +++ b/system/composite/Makefile @@ -143,3 +143,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/cu/Makefile b/system/cu/Makefile index 68024a0e9..394e2a140 100644 --- a/system/cu/Makefile +++ b/system/cu/Makefile @@ -139,3 +139,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile index 07d9d142e..4d0e7b399 100644 --- a/system/flash_eraseall/Makefile +++ b/system/flash_eraseall/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/install/Makefile +# apps/system/flash_eraseall/Makefile # # Copyright (C) 2011 Uros Platise. All rights reserved. # Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. @@ -147,3 +147,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/free/Makefile b/system/free/Makefile index fb6aa73a2..5f777b763 100644 --- a/system/free/Makefile +++ b/system/free/Makefile @@ -142,3 +142,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/hex2bin/Makefile b/system/hex2bin/Makefile index 6c5b34340..390fa2c5b 100644 --- a/system/hex2bin/Makefile +++ b/system/hex2bin/Makefile @@ -179,3 +179,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/hexed/Makefile b/system/hexed/Makefile index b4cec99c8..fc115d076 100644 --- a/system/hexed/Makefile +++ b/system/hexed/Makefile @@ -146,3 +146,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/i2c/Makefile b/system/i2c/Makefile index c9160c9c8..fe03441f2 100644 --- a/system/i2c/Makefile +++ b/system/i2c/Makefile @@ -134,3 +134,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/install/Makefile b/system/install/Makefile index 65a3e97d1..7053f5307 100644 --- a/system/install/Makefile +++ b/system/install/Makefile @@ -147,3 +147,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/lm75/Makefile b/system/lm75/Makefile index a80286254..dd08d7c6b 100644 --- a/system/lm75/Makefile +++ b/system/lm75/Makefile @@ -147,3 +147,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/mdio/Makefile b/system/mdio/Makefile index 2d400ea09..db2a01baf 100644 --- a/system/mdio/Makefile +++ b/system/mdio/Makefile @@ -135,3 +135,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/netdb/Makefile b/system/netdb/Makefile index 3719c1f91..3cc74eaf7 100644 --- a/system/netdb/Makefile +++ b/system/netdb/Makefile @@ -117,3 +117,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile index 3b01c4e13..411833515 100644 --- a/system/nxplayer/Makefile +++ b/system/nxplayer/Makefile @@ -156,3 +156,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/prun/Makefile b/system/prun/Makefile index 73d5ca470..61e6d10a7 100644 --- a/system/prun/Makefile +++ b/system/prun/Makefile @@ -153,3 +153,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/ramtest/Makefile b/system/ramtest/Makefile index f9078cf72..5f097956a 100644 --- a/system/ramtest/Makefile +++ b/system/ramtest/Makefile @@ -41,7 +41,7 @@ ifeq ($(WINTOOL),y) INCDIROPT = -w endif -# USB Monitor Application +# RAM test PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 768 @@ -140,3 +140,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/readline/Makefile b/system/readline/Makefile index 191c36cb9..0466f914f 100644 --- a/system/readline/Makefile +++ b/system/readline/Makefile @@ -112,3 +112,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/sched_note/Makefile b/system/sched_note/Makefile index 913d7ae20..b6caf3f69 100644 --- a/system/sched_note/Makefile +++ b/system/sched_note/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/note/Makefile +# apps/system/sched_note/Makefile # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/system/stackmonitor/Makefile b/system/stackmonitor/Makefile index 40624f5fe..576b74949 100644 --- a/system/stackmonitor/Makefile +++ b/system/stackmonitor/Makefile @@ -144,3 +144,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/sudoku/Makefile b/system/sudoku/Makefile index 18a6865df..6543639c4 100644 --- a/system/sudoku/Makefile +++ b/system/sudoku/Makefile @@ -143,3 +143,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/symtab/Makefile b/system/symtab/Makefile index 196c1a786..1f9946f38 100644 --- a/system/symtab/Makefile +++ b/system/symtab/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/system/Makefile +# apps/system/symtab/Makefile # # Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -102,3 +102,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/ubloxmodem/Makefile b/system/ubloxmodem/Makefile index e6979c627..5d057e70d 100644 --- a/system/ubloxmodem/Makefile +++ b/system/ubloxmodem/Makefile @@ -132,3 +132,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/usbmonitor/Makefile b/system/usbmonitor/Makefile index 5afb249db..9bb0c8534 100644 --- a/system/usbmonitor/Makefile +++ b/system/usbmonitor/Makefile @@ -117,3 +117,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/usbmsc/Makefile b/system/usbmsc/Makefile index 7d2ef010b..1c9e89839 100644 --- a/system/usbmsc/Makefile +++ b/system/usbmsc/Makefile @@ -146,3 +146,5 @@ distclean: clean -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/vi/Makefile b/system/vi/Makefile index b679115df..83f39253b 100644 --- a/system/vi/Makefile +++ b/system/vi/Makefile @@ -144,3 +144,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/zmodem/Makefile b/system/zmodem/Makefile index 739f52390..e1bdff5bd 100644 --- a/system/zmodem/Makefile +++ b/system/zmodem/Makefile @@ -155,3 +155,5 @@ distclean: clean $(call DELFILE, .depend) -include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/zoneinfo/Makefile b/system/zoneinfo/Makefile index b2b4d8d14..ae8b5c05e 100755 --- a/system/zoneinfo/Makefile +++ b/system/zoneinfo/Makefile @@ -170,3 +170,6 @@ distclean: clean $(call DELDIR, tzcode) -include Make.dep +.PHONY:preconfig +preconfig: + From b354a41fd42e190d471bc8a7a297a3022c89106a Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:25:51 +0200 Subject: [PATCH 04/27] Use directory.mk for recursive dir makefiles --- graphics/Makefile | 38 +--------------------------------- interpreters/Makefile | 44 +--------------------------------------- netutils/Makefile | 35 +------------------------------- system/Makefile | 47 +------------------------------------------ 4 files changed, 4 insertions(+), 160 deletions(-) diff --git a/graphics/Makefile b/graphics/Makefile index 7f33fe2a4..60b1c91ae 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -33,40 +33,4 @@ # ############################################################################ --include $(TOPDIR)/.config - -# Sub-directories - -SUBDIRS = tiff screenshot traveler - -# Sub-directories that might need context setup - -CNTXTDIRS = - -all: nothing -.PHONY: nothing context depend clean distclean - -define SDIR_template -$(1)_$(2): - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -endef - -# $(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context))) -$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend))) -$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean))) -$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) - -nothing: - -install: - -context: # $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context) - -depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) - -clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean) - -distclean: clean $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean) - --include Make.dep - +include $(APPDIR)/Directory.mk diff --git a/interpreters/Makefile b/interpreters/Makefile index acbbd6e3b..0e499e268 100644 --- a/interpreters/Makefile +++ b/interpreters/Makefile @@ -33,46 +33,4 @@ # ############################################################################ --include $(TOPDIR)/.config - -# Sub-directories containing interpreter runtime - -SUBDIRS = bas ficl micropython pcode prun - -# Create the list of installed runtime modules (INSTALLED_DIRS) - -ifeq ($(CONFIG_WINDOWS_NATIVE),y) -define ADD_DIRECTORY -INSTALLED_DIRS += ${shell if exist $1\Makefile (echo $1)} -endef -else -define ADD_DIRECTORY -INSTALLED_DIRS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi} -endef -endif - -$(foreach DIR, $(SUBDIRS), $(eval $(call ADD_DIRECTORY,$(DIR)))) - -all: nothing -.PHONY: nothing context depend clean distclean - -define SDIR_template -$(1)_$(2): - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -endef - -$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend))) -$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),clean))) -$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) - -nothing: - -install: - -context: - -depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend) - -clean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_clean) - -distclean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean) +include $(APPDIR)/Directory.mk diff --git a/netutils/Makefile b/netutils/Makefile index 2bafef333..3cab860f7 100644 --- a/netutils/Makefile +++ b/netutils/Makefile @@ -33,37 +33,4 @@ # ############################################################################ --include $(TOPDIR)/.config # Current configuration - -# Sub-directories - -SUBDIRS = chat json codecs esp8266 -ifeq ($(CONFIG_NET),y) -SUBDIRS += netlib dhcpc dhcpd discover ftpc ftpd smtp telnetd -SUBDIRS += webclient webserver tftpc thttpd xmlrpc pppd -endif - -all: nothing - -.PHONY: nothing context depend clean distclean - -define SDIR_template -$(1)_$(2): - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -endef - -$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend))) -$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean))) -$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) - -nothing: - -install: - -context: - -depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) - -clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean) - -distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean) +include $(APPDIR)/Directory.mk diff --git a/system/Makefile b/system/Makefile index 04b2deef5..eae61b31c 100644 --- a/system/Makefile +++ b/system/Makefile @@ -33,49 +33,4 @@ # ############################################################################ --include $(TOPDIR)/.config # Current configuration - -# Sub-directories containing system tasks/libraries - -SUBDIRS = cdcacm cle composite cu flash_eraseall free i2c hex2bin install -SUBDIRS += hexed lm75 mdio netdb nxplayer ramtest readline -SUBDIRS += stackmonitor sudoku symtab ubloxmodem usbmonitor usbmsc vi -SUBDIRS += zmodem zoneinfo - -# Create the list of installed runtime modules (INSTALLED_DIRS) - -ifeq ($(CONFIG_WINDOWS_NATIVE),y) -define ADD_DIRECTORY - INSTALLED_DIRS += $(if $(wildcard .\$1\Makefile),$1,) -endef -else -define ADD_DIRECTORY - INSTALLED_DIRS += $(if $(wildcard ./$1/Makefile),$1,) -endef -endif - -$(foreach DIR, $(SUBDIRS), $(eval $(call ADD_DIRECTORY,$(DIR)))) - -all: nothing -.PHONY: nothing context depend clean distclean - -define SDIR_template -$(1)_$(2): - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -endef - -$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend))) -$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),clean))) -$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) - -nothing: - -install: - -context: - -depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend) - -clean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_clean) - -distclean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean) +include $(APPDIR)/Directory.mk From ae6c0b832c6b5009ba206d06aac0c1098cf95798 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:26:32 +0200 Subject: [PATCH 05/27] Individual app kconfig fixes --- graphics/traveler/Kconfig | 7 +++++ netutils/ping/Kconfig | 61 ++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/graphics/traveler/Kconfig b/graphics/traveler/Kconfig index f1a02a4f9..df1fee8a6 100644 --- a/graphics/traveler/Kconfig +++ b/graphics/traveler/Kconfig @@ -2,8 +2,15 @@ # For a description of the syntax of this configuration file, # see the file kconfig-language.txt in the NuttX tools repository. # +config GRAPHICS_TRAVELER + bool "Traveler game" + default n + select FSUTILS_INIFILE + ---help--- + Enable or disable the graphic Traveler game if GRAPHICS_TRAVELER + comment "Color configuration" choice diff --git a/netutils/ping/Kconfig b/netutils/ping/Kconfig index 81efef2bb..0986ebc94 100644 --- a/netutils/ping/Kconfig +++ b/netutils/ping/Kconfig @@ -1,30 +1,31 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -config NETUTILS_PING - bool "ICMP ping support" - default n - depends on NET_IPv4 && NET_ICMP && NET_PKT - help - Build in support for a IPv4 ping command. This command ping will - send the ICMP ECHO_REQUEST and wait for the ICMP ECHO_RESPONSE from - the remote peer. - -config NETUTILS_PING6 - bool "ICMPv6 ping support" - default n - depends on NET_IPv6 && NET_ICMPv6 && NET_PKT - help - Build in support for a IPv6 ping command. This command ping will - send the ICMPv6 ECHO_REQUEST and wait for the ICMPv6 ECHO_RESPONSE - from the remote peer. - -if NETUTILS_PING || NETUTILS_PING6 - -config NETUTILS_PING_SIGNO - int "Ping timeout signal" - default 13 - -endif # NETUTILS_PING || NETUTILS_PING6 \ No newline at end of file +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +config NETUTILS_PING + bool "ICMP ping support" + default n + depends on NET_IPv4 && NET_ICMP && NET_PKT + help + Build in support for a IPv4 ping command. This command ping will + send the ICMP ECHO_REQUEST and wait for the ICMP ECHO_RESPONSE from + the remote peer. + +config NETUTILS_PING6 + bool "ICMPv6 ping support" + default n + depends on NET_IPv6 && NET_ICMPv6 && NET_PKT + help + Build in support for a IPv6 ping command. This command ping will + send the ICMPv6 ECHO_REQUEST and wait for the ICMPv6 ECHO_RESPONSE + from the remote peer. + +if NETUTILS_PING || NETUTILS_PING6 + +config NETUTILS_PING_SIGNO + int "Ping timeout signal" + default 13 + +endif # NETUTILS_PING || NETUTILS_PING6 + From a9aa753fa4d282bc0aa48333ece593bdb5dc707b Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:34:00 +0200 Subject: [PATCH 06/27] Recursive Kconfig autogeneration --- Application.mk | 4 +- Directory.mk | 5 ++ Make.defs | 8 ++++ Makefile | 15 ++---- canutils/.gitignore | 2 + canutils/Kconfig | 11 ----- examples/.gitignore | 2 + examples/Kconfig | 102 ---------------------------------------- fsutils/.gitignore | 2 + fsutils/Kconfig | 12 ----- gpsutils/.gitignore | 2 + gpsutils/Kconfig | 10 ---- graphics/.gitignore | 2 + graphics/Kconfig | 36 -------------- interpreters/.gitignore | 2 + interpreters/Kconfig | 25 ---------- netutils/.gitignore | 4 +- netutils/Kconfig | 28 ----------- system/.gitignore | 2 + system/Kconfig | 36 -------------- tools/mkkconfig.sh | 62 ++++++++++-------------- 21 files changed, 62 insertions(+), 310 deletions(-) create mode 100644 canutils/.gitignore delete mode 100644 canutils/Kconfig create mode 100644 examples/.gitignore delete mode 100644 examples/Kconfig create mode 100644 fsutils/.gitignore delete mode 100644 fsutils/Kconfig create mode 100644 gpsutils/.gitignore delete mode 100644 gpsutils/Kconfig create mode 100644 graphics/.gitignore delete mode 100644 graphics/Kconfig delete mode 100644 interpreters/Kconfig delete mode 100644 netutils/Kconfig create mode 100644 system/.gitignore delete mode 100644 system/Kconfig diff --git a/Application.mk b/Application.mk index 5b7a4e5ad..cc62e8dc6 100644 --- a/Application.mk +++ b/Application.mk @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . VPATH = all: .built -.PHONY: clean depend distclean +.PHONY: clean preconfig depend distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -103,6 +103,8 @@ else install: endif +preconfig: + ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifneq ($(APPNAME),) ifneq ($(PRIORITY),) diff --git a/Directory.mk b/Directory.mk index 9c233fe9c..a9880178e 100644 --- a/Directory.mk +++ b/Directory.mk @@ -34,6 +34,7 @@ ############################################################################ -include $(TOPDIR)/.config # Current configuration +include $(APPDIR)/Make.defs # Sub-directories @@ -48,6 +49,7 @@ $(1)_$(2): $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" endef +$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),context))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean))) @@ -57,6 +59,9 @@ nothing: install: +preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig) + $(MKKCONFIG) -m "$(shell cat Kmenu)" + context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context) depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) diff --git a/Make.defs b/Make.defs index 77007503b..ab9f3fe6c 100644 --- a/Make.defs +++ b/Make.defs @@ -53,3 +53,11 @@ define REGISTER $(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated" endef endif + +# Tools + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + MKKCONFIG = $(APPDIR)\tools\mkkconfig.bat +else + MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh +endif diff --git a/Makefile b/Makefile index 76b23eddd..6039d15b6 100644 --- a/Makefile +++ b/Makefile @@ -39,14 +39,7 @@ APPDIR = ${shell pwd} TOPDIR ?= $(APPDIR)/import -include $(TOPDIR)/Make.defs - -# Tools - -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - MKKCONFIG = ${shell $(APPDIR)\tools\mkkconfig.bat} -else - MKKCONFIG = ${shell $(APPDIR)/tools/mkkconfig.sh} -endif +-include $(APPDIR)/Make.defs # Application Directories @@ -90,6 +83,7 @@ $(1)_$(2): $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" endef +$(foreach SDIR, $(BUILDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),install))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),context))) @@ -119,11 +113,10 @@ context_serialize: context: context_serialize -Kconfig: $(MKKCONFIG) +preconfig:$(foreach SDIR, $(BUILDIRS), $(SDIR)_preconfig) + echo subdirs done $(MKKCONFIG) -preconfig: Kconfig - .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend) .depend: context Makefile .depdirs diff --git a/canutils/.gitignore b/canutils/.gitignore new file mode 100644 index 000000000..99f41601f --- /dev/null +++ b/canutils/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/canutils/Kconfig b/canutils/Kconfig deleted file mode 100644 index 5fe2e45ce..000000000 --- a/canutils/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "CAN Utilities" - -source "$APPSDIR/canutils/libcanard/Kconfig" -source "$APPSDIR/canutils/libuavcan/Kconfig" - -endmenu # CAN Utilities diff --git a/examples/.gitignore b/examples/.gitignore new file mode 100644 index 000000000..99f41601f --- /dev/null +++ b/examples/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/examples/Kconfig b/examples/Kconfig deleted file mode 100644 index bf8a2b3de..000000000 --- a/examples/Kconfig +++ /dev/null @@ -1,102 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "Examples" - -source "$APPSDIR/examples/adc/Kconfig" -source "$APPSDIR/examples/ajoystick/Kconfig" -source "$APPSDIR/examples/alarm/Kconfig" -source "$APPSDIR/examples/bastest/Kconfig" -source "$APPSDIR/examples/bridge/Kconfig" -source "$APPSDIR/examples/buttons/Kconfig" -source "$APPSDIR/examples/can/Kconfig" -source "$APPSDIR/examples/cc3000/Kconfig" -source "$APPSDIR/examples/chat/Kconfig" -source "$APPSDIR/examples/configdata/Kconfig" -source "$APPSDIR/examples/cpuhog/Kconfig" -source "$APPSDIR/examples/cxxtest/Kconfig" -source "$APPSDIR/examples/dhcpd/Kconfig" -source "$APPSDIR/examples/djoystick/Kconfig" -source "$APPSDIR/examples/elf/Kconfig" -source "$APPSDIR/examples/fstest/Kconfig" -source "$APPSDIR/examples/ftpc/Kconfig" -source "$APPSDIR/examples/ftpd/Kconfig" -source "$APPSDIR/examples/hello/Kconfig" -source "$APPSDIR/examples/helloxx/Kconfig" -source "$APPSDIR/examples/json/Kconfig" -source "$APPSDIR/examples/hidkbd/Kconfig" -source "$APPSDIR/examples/keypadtest/Kconfig" -source "$APPSDIR/examples/igmp/Kconfig" -source "$APPSDIR/examples/i2schar/Kconfig" -source "$APPSDIR/examples/lcdrw/Kconfig" -source "$APPSDIR/examples/leds/Kconfig" -source "$APPSDIR/examples/ltdc/Kconfig" -source "$APPSDIR/examples/media/Kconfig" -source "$APPSDIR/examples/mm/Kconfig" -source "$APPSDIR/examples/modbus/Kconfig" -source "$APPSDIR/examples/module/Kconfig" -source "$APPSDIR/examples/mount/Kconfig" -source "$APPSDIR/examples/mtdpart/Kconfig" -source "$APPSDIR/examples/mtdrwb/Kconfig" -source "$APPSDIR/examples/netloop/Kconfig" -source "$APPSDIR/examples/netpkt/Kconfig" -source "$APPSDIR/examples/nettest/Kconfig" -source "$APPSDIR/examples/nrf24l01_term/Kconfig" -source "$APPSDIR/examples/nsh/Kconfig" -source "$APPSDIR/examples/null/Kconfig" -source "$APPSDIR/examples/nx/Kconfig" -source "$APPSDIR/examples/nxterm/Kconfig" -source "$APPSDIR/examples/nxffs/Kconfig" -source "$APPSDIR/examples/nxflat/Kconfig" -source "$APPSDIR/examples/nxhello/Kconfig" -source "$APPSDIR/examples/nximage/Kconfig" -source "$APPSDIR/examples/nxlines/Kconfig" -source "$APPSDIR/examples/nxtext/Kconfig" -source "$APPSDIR/examples/ostest/Kconfig" -source "$APPSDIR/examples/pashello/Kconfig" -source "$APPSDIR/examples/pca9635/Kconfig" -source "$APPSDIR/examples/pipe/Kconfig" -source "$APPSDIR/examples/poll/Kconfig" -source "$APPSDIR/examples/pppd/Kconfig" -source "$APPSDIR/examples/pwm/Kconfig" -source "$APPSDIR/examples/posix_spawn/Kconfig" -source "$APPSDIR/examples/qencoder/Kconfig" -source "$APPSDIR/examples/random/Kconfig" -source "$APPSDIR/examples/relays/Kconfig" -source "$APPSDIR/examples/rgbled/Kconfig" -source "$APPSDIR/examples/rgmp/Kconfig" -source "$APPSDIR/examples/romfs/Kconfig" -source "$APPSDIR/examples/sendmail/Kconfig" -source "$APPSDIR/examples/serialblaster/Kconfig" -source "$APPSDIR/examples/serialrx/Kconfig" -source "$APPSDIR/examples/serloop/Kconfig" -source "$APPSDIR/examples/slcd/Kconfig" -source "$APPSDIR/examples/flash_test/Kconfig" -source "$APPSDIR/examples/smart_test/Kconfig" -source "$APPSDIR/examples/smart/Kconfig" -source "$APPSDIR/examples/smp/Kconfig" -source "$APPSDIR/examples/tcpecho/Kconfig" -source "$APPSDIR/examples/telnetd/Kconfig" -source "$APPSDIR/examples/thttpd/Kconfig" -source "$APPSDIR/examples/timer/Kconfig" -source "$APPSDIR/examples/tiff/Kconfig" -source "$APPSDIR/examples/touchscreen/Kconfig" -source "$APPSDIR/examples/uavcan/Kconfig" -source "$APPSDIR/examples/udp/Kconfig" -source "$APPSDIR/examples/udpblaster/Kconfig" -source "$APPSDIR/examples/discover/Kconfig" -source "$APPSDIR/examples/webserver/Kconfig" -source "$APPSDIR/examples/unionfs/Kconfig" -source "$APPSDIR/examples/usbserial/Kconfig" -source "$APPSDIR/examples/usbterm/Kconfig" -source "$APPSDIR/examples/udgram/Kconfig" -source "$APPSDIR/examples/ustream/Kconfig" -source "$APPSDIR/examples/watchdog/Kconfig" -source "$APPSDIR/examples/wget/Kconfig" -source "$APPSDIR/examples/wgetjson/Kconfig" -source "$APPSDIR/examples/xmlrpc/Kconfig" -source "$APPSDIR/examples/zerocross/Kconfig" - -endmenu # Examples diff --git a/fsutils/.gitignore b/fsutils/.gitignore new file mode 100644 index 000000000..99f41601f --- /dev/null +++ b/fsutils/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/fsutils/Kconfig b/fsutils/Kconfig deleted file mode 100644 index b6f57cc34..000000000 --- a/fsutils/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "File System Utilities" - -source "$APPSDIR/fsutils/inifile/Kconfig" -source "$APPSDIR/fsutils/mksmartfs/Kconfig" -source "$APPSDIR/fsutils/passwd/Kconfig" - -endmenu # FS Utilities diff --git a/gpsutils/.gitignore b/gpsutils/.gitignore new file mode 100644 index 000000000..99f41601f --- /dev/null +++ b/gpsutils/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/gpsutils/Kconfig b/gpsutils/Kconfig deleted file mode 100644 index 9797cd6f3..000000000 --- a/gpsutils/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "GPS Utilities" - -source "$APPSDIR/gpsutils/minmea/Kconfig" - -endmenu # GPS Utilities diff --git a/graphics/.gitignore b/graphics/.gitignore new file mode 100644 index 000000000..99f41601f --- /dev/null +++ b/graphics/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/graphics/Kconfig b/graphics/Kconfig deleted file mode 100644 index e8cdcaed5..000000000 --- a/graphics/Kconfig +++ /dev/null @@ -1,36 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "Graphics Support" - -config TIFF - bool "TIFF file generation library" - default n - ---help--- - Enable support for the TIFF file generation program. - -if TIFF - -menu "TIFF Screenshot Utility" -source "$APPSDIR/graphics/screenshot/Kconfig" -endmenu - -endif # TIFF - -config GRAPHICS_TRAVELER - bool "Traveler game" - default n - select FSUTILS_INIFILE - ---help--- - Enable or disable the graphic Traveler game - -if GRAPHICS_TRAVELER - -menu "Traveler game" -source "$APPSDIR/graphics/traveler/Kconfig" -endmenu - -endif # GRAPHICS_TRAVELER -endmenu # Graphics Support diff --git a/interpreters/.gitignore b/interpreters/.gitignore index e69de29bb..99f41601f 100644 --- a/interpreters/.gitignore +++ b/interpreters/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/interpreters/Kconfig b/interpreters/Kconfig deleted file mode 100644 index bed828685..000000000 --- a/interpreters/Kconfig +++ /dev/null @@ -1,25 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "Interpreters" - -source "$APPSDIR/interpreters/bas/Kconfig" -source "$APPSDIR/interpreters/ficl/Kconfig" - -config INTERPRETERS_PCODE - bool "Pascal p-code interpreter" - default n - ---help--- - Enable support for the Pascal p-code interpreter. See the README.txt - file at located in the NuttX Pascal repository and also the - README.txt file in the apps/interpreter directory. Use of this - configuration implies that you have performed the required - installation of the Pascal run-time code. - -if INTERPRETERS_PCODE -endif - -source "$APPSDIR/interpreters/micropython/Kconfig" -endmenu # Interpreters diff --git a/netutils/.gitignore b/netutils/.gitignore index 123ef2355..6b672f6b9 100644 --- a/netutils/.gitignore +++ b/netutils/.gitignore @@ -12,4 +12,6 @@ *.sym *.adb *.lib -*.src +*.srci +/Kconfig + diff --git a/netutils/Kconfig b/netutils/Kconfig deleted file mode 100644 index 2f439ce7d..000000000 --- a/netutils/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "Network Utilities" - -source "$APPSDIR/netutils/chat/Kconfig" -source "$APPSDIR/netutils/codecs/Kconfig" -source "$APPSDIR/netutils/dhcpc/Kconfig" -source "$APPSDIR/netutils/dhcpd/Kconfig" -source "$APPSDIR/netutils/esp8266/Kconfig" -source "$APPSDIR/netutils/ftpc/Kconfig" -source "$APPSDIR/netutils/ftpd/Kconfig" -source "$APPSDIR/netutils/json/Kconfig" -source "$APPSDIR/netutils/smtp/Kconfig" -source "$APPSDIR/netutils/telnetd/Kconfig" -source "$APPSDIR/netutils/tftpc/Kconfig" -source "$APPSDIR/netutils/thttpd/Kconfig" -source "$APPSDIR/netutils/netlib/Kconfig" -source "$APPSDIR/netutils/webclient/Kconfig" -source "$APPSDIR/netutils/webserver/Kconfig" -source "$APPSDIR/netutils/ntpclient/Kconfig" -source "$APPSDIR/netutils/discover/Kconfig" -source "$APPSDIR/netutils/xmlrpc/Kconfig" -source "$APPSDIR/netutils/pppd/Kconfig" - -endmenu # Network Utilities diff --git a/system/.gitignore b/system/.gitignore new file mode 100644 index 000000000..99f41601f --- /dev/null +++ b/system/.gitignore @@ -0,0 +1,2 @@ +/Kconfig + diff --git a/system/Kconfig b/system/Kconfig deleted file mode 100644 index 3a57198fb..000000000 --- a/system/Kconfig +++ /dev/null @@ -1,36 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menu "System Libraries and NSH Add-Ons" - -source "$APPSDIR/system/free/Kconfig" -source "$APPSDIR/system/cle/Kconfig" -source "$APPSDIR/system/cu/Kconfig" -source "$APPSDIR/system/install/Kconfig" -source "$APPSDIR/system/flash_eraseall/Kconfig" -source "$APPSDIR/system/hex2bin/Kconfig" -source "$APPSDIR/system/i2c/Kconfig" -source "$APPSDIR/system/hexed/Kconfig" -source "$APPSDIR/system/netdb/Kconfig" -source "$APPSDIR/system/nxplayer/Kconfig" -source "$APPSDIR/system/ramtest/Kconfig" -source "$APPSDIR/system/readline/Kconfig" -source "$APPSDIR/system/prun/Kconfig" -source "$APPSDIR/system/mdio/Kconfig" -source "$APPSDIR/system/sudoku/Kconfig" -source "$APPSDIR/system/lm75/Kconfig" -source "$APPSDIR/system/vi/Kconfig" -source "$APPSDIR/system/sched_note/Kconfig" -source "$APPSDIR/system/stackmonitor/Kconfig" -source "$APPSDIR/system/symtab/Kconfig" -source "$APPSDIR/system/cdcacm/Kconfig" -source "$APPSDIR/system/composite/Kconfig" -source "$APPSDIR/system/ubloxmodem/Kconfig" -source "$APPSDIR/system/usbmsc/Kconfig" -source "$APPSDIR/system/usbmonitor/Kconfig" -source "$APPSDIR/system/zmodem/Kconfig" -source "$APPSDIR/system/zoneinfo/Kconfig" - -endmenu # System Libraries and NSH Add-Ons diff --git a/tools/mkkconfig.sh b/tools/mkkconfig.sh index 714ca5117..0be3245f2 100755 --- a/tools/mkkconfig.sh +++ b/tools/mkkconfig.sh @@ -34,18 +34,18 @@ # Get the input parameter list -USAGE="USAGE: mkkconfig.sh [-d] [-h] [-t ] [-o ]" -unset TOPDIR +USAGE="USAGE: mkkconfig.sh [-d] [-h] [-m ] [-o ]" KCONFIG=Kconfig +unset MENU while [ ! -z "$1" ]; do case $1 in -d ) set -x ;; - -t ) + -m ) shift - TOPDIR=$1 + MENU=$1 ;; -o ) shift @@ -64,44 +64,32 @@ while [ ! -z "$1" ]; do shift done -# Check arguments -if [ -z "$TOPDIR" ]; then - if [ -x "tools/mkkconfig.sh" ]; then - TOPDIR=$PWD - else - cd .. || { echo "cd .. failed"; exit 1; } - if [ -x "tools/mkkconfig.sh" ]; then - TOPDIR=$PWD - else - echo "ERROR: This script must be executed from a known location" - echo " OR you must provide the path in the command line" - echo $USAGE - exit 1 - fi - fi -else - if [ ! -x "${TOPDIR}/tools/mkkconfig.sh" ]; then - echo "ERROR: \"${TOPDIR}\" is not correct" - echo $USAGE - exit 1 - fi - cd ${TOPDIR} || { echo "cd ${TOPDIR} failed"; exit 1; } +if [ -f ${KCONFIG} ]; then + rm ${KCONFIG} || { echo "ERROR: Failed to remove $PWD/${KCONFIG}"; exit 1; } fi -if [ -f ${TOPDIR}/${KCONFIG} ]; then - rm ${TOPDIR}/${KCONFIG} || { echo "ERROR: Failed to remove ${TOPDIR}/${KCONFIG}"; exit 1; } +echo mkkconfig in $PWD + +KCONFIG_LIST=`ls -1 $PWD/*/Kconfig` + +echo "#" > ${KCONFIG} +echo "# For a description of the syntax of this configuration file," >> ${KCONFIG} +echo "# see the file kconfig-language.txt in the NuttX tools repository." >> ${KCONFIG} +echo "#" >> ${KCONFIG} +echo "# This file is autogenerated, do not edit." >> ${KCONFIG} +echo "#" >> ${KCONFIG} +echo "" >> ${KCONFIG} + +if [ ! -z "${MENU}" ]; then + echo "menu \"${MENU}\"" >> ${KCONFIG} fi -KCONFIG_LIST=`ls -1 */Kconfig` - -echo "#" > ${TOPDIR}/${KCONFIG} -echo "# For a description of the syntax of this configuration file," >> ${TOPDIR}/${KCONFIG} -echo "# see the file kconfig-language.txt in the NuttX tools repository." >> ${TOPDIR}/${KCONFIG} -echo "#" >> ${TOPDIR}/${KCONFIG} -echo "" >> ${TOPDIR}/${KCONFIG} - for FILE in ${KCONFIG_LIST}; do - echo "source \"\$APPSDIR/${FILE}\"" >> ${TOPDIR}/${KCONFIG} + echo "source \"${FILE}\"" >> ${KCONFIG} done +if [ ! -z "${MENU}" ]; then + echo "endmenu # ${MENU}" >> ${KCONFIG} +fi + From 80ae4683fe77ab81d233da6bca013dbc3c66e4e9 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:34:22 +0200 Subject: [PATCH 07/27] Add kconfig files for pcode and tiff --- graphics/tiff/Kconfig | 9 +++++++++ interpreters/pcode/Kconfig | 13 +++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 graphics/tiff/Kconfig create mode 100644 interpreters/pcode/Kconfig diff --git a/graphics/tiff/Kconfig b/graphics/tiff/Kconfig new file mode 100644 index 000000000..7c3858271 --- /dev/null +++ b/graphics/tiff/Kconfig @@ -0,0 +1,9 @@ +config TIFF + bool "TIFF file generation library" + default n + ---help--- + Enable support for the TIFF file generation program. + +if TIFF +endif # TIFF + diff --git a/interpreters/pcode/Kconfig b/interpreters/pcode/Kconfig new file mode 100644 index 000000000..f63ca56f4 --- /dev/null +++ b/interpreters/pcode/Kconfig @@ -0,0 +1,13 @@ +config INTERPRETERS_PCODE + bool "Pascal p-code interpreter" + default n + ---help--- + Enable support for the Pascal p-code interpreter. See the README.txt + file at located in the NuttX Pascal repository and also the + README.txt file in the apps/interpreter directory. Use of this + configuration implies that you have performed the required + installation of the Pascal run-time code. + +if INTERPRETERS_PCODE +endif + From 6217849db28a0bd9faa2e88402b9f2dd26e8fb96 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 2 Jun 2016 16:54:39 +0200 Subject: [PATCH 08/27] fix a gitignore rule --- netutils/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netutils/.gitignore b/netutils/.gitignore index 6b672f6b9..685ae41bd 100644 --- a/netutils/.gitignore +++ b/netutils/.gitignore @@ -12,6 +12,6 @@ *.sym *.adb *.lib -*.srci +*.src /Kconfig From 19be2cafea4960269225f7b9a78b7e5442e11494 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 5 Jun 2016 08:41:02 -0600 Subject: [PATCH 09/27] Fix name collision in flash_eraseall restoration. --- system/flash_eraseall/Makefile | 2 +- .../flash_eraseall/{flash_eraseall.c => flash_eraseall_main.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename system/flash_eraseall/{flash_eraseall.c => flash_eraseall_main.c} (100%) diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile index d9e97e5d1..cad71b307 100644 --- a/system/flash_eraseall/Makefile +++ b/system/flash_eraseall/Makefile @@ -55,7 +55,7 @@ STACKSIZE = 1024 ASRCS = CSRCS = -MAINSRC = flash_eraseall.c +MAINSRC = flash_eraseall_main.c AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/system/flash_eraseall/flash_eraseall.c b/system/flash_eraseall/flash_eraseall_main.c similarity index 100% rename from system/flash_eraseall/flash_eraseall.c rename to system/flash_eraseall/flash_eraseall_main.c From a442f52a1efa56f0e78359efe309d86004015e88 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 5 Jun 2016 09:18:04 -0600 Subject: [PATCH 10/27] apps/canutils/libuavcan: Fix for recent change to STM32 timer frequency definiitions --- ...96ace50155573e545ed9bf2fb09964ee2367.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/canutils/libuavcan/nuttx-b04396ace50155573e545ed9bf2fb09964ee2367.patch b/canutils/libuavcan/nuttx-b04396ace50155573e545ed9bf2fb09964ee2367.patch index 2751c666f..7ad7d9170 100644 --- a/canutils/libuavcan/nuttx-b04396ace50155573e545ed9bf2fb09964ee2367.patch +++ b/canutils/libuavcan/nuttx-b04396ace50155573e545ed9bf2fb09964ee2367.patch @@ -23,3 +23,43 @@ } }; +--- libuavcan/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp.orig 2016-06-05 09:12:29.086814547 -0600 ++++ libuavcan/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp 2016-06-05 09:15:03.676810202 -0600 +@@ -31,17 +31,30 @@ + + # if UAVCAN_STM32_NUTTX + # define TIMX UAVCAN_STM32_GLUE3(STM32_TIM, UAVCAN_STM32_TIMER_NUMBER, _BASE) +-# define TMR_REG(o) (TIMX + (o)) +-# define TIMX_INPUT_CLOCK STM32_TIM27_FREQUENCY ++# define TMR_REG(o) (TIMX + (o)) + +-# define TIMX_IRQn UAVCAN_STM32_GLUE2(STM32_IRQ_TIM, UAVCAN_STM32_TIMER_NUMBER) ++# if UAVCAN_STM32_TIMER_NUMBER == 2 ++# define TIMX_INPUT_CLOCK BOARD_TIM2_FREQUENCY ++# elif UAVCAN_STM32_TIMER_NUMBER == 3 ++# define TIMX_INPUT_CLOCK BOARD_TIM3_FREQUENCY ++# elif UAVCAN_STM32_TIMER_NUMBER == 4 ++# define TIMX_INPUT_CLOCK BOARD_TIM4_FREQUENCY ++# elif UAVCAN_STM32_TIMER_NUMBER == 5 ++# define TIMX_INPUT_CLOCK BOARD_TIM5_FREQUENCY ++# elif UAVCAN_STM32_TIMER_NUMBER == 6 ++# define TIMX_INPUT_CLOCK BOARD_TIM6_FREQUENCY ++# elif UAVCAN_STM32_TIMER_NUMBER == 7 ++# define TIMX_INPUT_CLOCK BOARD_TIM7_FREQUENCY ++# endif ++ ++# define TIMX_IRQn UAVCAN_STM32_GLUE2(STM32_IRQ_TIM, UAVCAN_STM32_TIMER_NUMBER) + # endif + + # if UAVCAN_STM32_TIMER_NUMBER >= 2 && UAVCAN_STM32_TIMER_NUMBER <= 7 +-# define TIMX_RCC_ENR RCC->APB1ENR +-# define TIMX_RCC_RSTR RCC->APB1RSTR +-# define TIMX_RCC_ENR_MASK UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM, UAVCAN_STM32_TIMER_NUMBER, EN) +-# define TIMX_RCC_RSTR_MASK UAVCAN_STM32_GLUE3(RCC_APB1RSTR_TIM, UAVCAN_STM32_TIMER_NUMBER, RST) ++# define TIMX_RCC_ENR RCC->APB1ENR ++# define TIMX_RCC_RSTR RCC->APB1RSTR ++# define TIMX_RCC_ENR_MASK UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM, UAVCAN_STM32_TIMER_NUMBER, EN) ++# define TIMX_RCC_RSTR_MASK UAVCAN_STM32_GLUE3(RCC_APB1RSTR_TIM, UAVCAN_STM32_TIMER_NUMBER, RST) + # else + # error "This UAVCAN_STM32_TIMER_NUMBER is not supported yet" + # endif From 98a9769a287d0c0e5d169b3509605442c8e4c096 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 5 Jun 2016 14:49:23 -0600 Subject: [PATCH 11/27] Updata ChangeLog --- ChangeLog.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index db39f1a84..98fd596e6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1607,6 +1607,8 @@ 7.17 2016-xx-xx Gregory Nutt + * apps/examples/alarm: ioctl call was clobbering file descriptor + (2016-06-02). * apps/system/flash_eraseall: Removed! This logic violates the OS/ application interface and cannot be supported. The old code can still be found in the 'Obsoleted' repository (2016-06-03). @@ -1614,4 +1616,5 @@ (2016-06-04). * apps/system/flash_eraseall: Restored! Using the new IOCTL wrapper at apps/fsutils/flash_eraseall (2016-06-04). - + * apps/canutils/libuavcan: Fix for recent change to STM32 timer frequency + definiitions (2016-06-05). From ff8f65370e28e5bda082205d12292e3bfa6b3480 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 6 Jun 2016 07:12:16 -0600 Subject: [PATCH 12/27] Update ChangeLog --- ChangeLog.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 98fd596e6..9815bd2a7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1618,3 +1618,11 @@ apps/fsutils/flash_eraseall (2016-06-04). * apps/canutils/libuavcan: Fix for recent change to STM32 timer frequency definiitions (2016-06-05). + * Many files: Change to the way that Kconfig files are generated in order + to better support reuse of the apps/ directory in NuttX products. Changes + include: add kmenu files, make the full tree use wildcards make.defs, Add + empty preconfig rules to 'leaf' makefiles, Use directory.mk for recursive + dir makefiles, Individual app kconfig fixes, Recursive Kconfig + autogeneration, Add kconfig files for pcode and tiff, and fix a gitignore + rule, From Sébastien Lorquet (2016-06-06). + From e725f5e9e16811537e7b423836acdbabaf2111e0 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Mon, 6 Jun 2016 09:42:29 -0600 Subject: [PATCH 13/27] Another changed needed with last Kmenu-related changes --- fsutils/flash_eraseall/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fsutils/flash_eraseall/Makefile b/fsutils/flash_eraseall/Makefile index 85139c3c3..b7f6c2288 100644 --- a/fsutils/flash_eraseall/Makefile +++ b/fsutils/flash_eraseall/Makefile @@ -83,6 +83,8 @@ $(COBJS): %$(OBJEXT): %.c install: +preconfig: + context: .depend: Makefile $(SRCS) From 807e51ad05056c5f63a901976ff6b1c89f993f8d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 6 Jun 2016 12:30:01 -0600 Subject: [PATCH 14/27] Update tools/mkkconfig.bat; silence some Makefile output --- Directory.mk | 2 +- Makefile | 3 +-- tools/mkkconfig.bat | 59 +++++++++++++++++---------------------------- 3 files changed, 24 insertions(+), 40 deletions(-) diff --git a/Directory.mk b/Directory.mk index a9880178e..e02230dd0 100644 --- a/Directory.mk +++ b/Directory.mk @@ -60,7 +60,7 @@ nothing: install: preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig) - $(MKKCONFIG) -m "$(shell cat Kmenu)" + $(Q) $(MKKCONFIG) -m "$(shell cat Kmenu)" context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context) diff --git a/Makefile b/Makefile index 6039d15b6..d8c848434 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,7 @@ context_serialize: context: context_serialize preconfig:$(foreach SDIR, $(BUILDIRS), $(SDIR)_preconfig) - echo subdirs done - $(MKKCONFIG) + $(Q) $(MKKCONFIG) .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend) diff --git a/tools/mkkconfig.bat b/tools/mkkconfig.bat index c2a2a1986..69082e8c5 100755 --- a/tools/mkkconfig.bat +++ b/tools/mkkconfig.bat @@ -2,7 +2,7 @@ REM apps/tools/mkkconfig.bat REM -REM Copyright (C) 2015 Gregory Nutt. All rights reserved. +REM Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. REM Author: Gregory Nutt REM REM Redistribution and use in source and binary forms, with or without @@ -35,12 +35,12 @@ REM REM Parse command line arguments -SET topdir= +SET menu= SET kconfig=Kconfig :ArgLoop IF "%1"=="" GOTO :EndOfLoop -IF "%1"=="-t" GOTO :SetTopDir +IF "%1"=="-m" GOTO :SetMenu IF "%1"=="-o" GOTO :SetKconfig IF "%1"=="-h" GOTO :ShowUsage @@ -51,9 +51,9 @@ GOTO :ShowUsage SET debug=-d GOTO :NextArg -:SetTopDir +:SetMenu SHIFT -SET topdir=%1 +SET menu=%1 GOTO :NextArg :SetKconfig @@ -67,34 +67,6 @@ GOTO :ArgLoop REM Check input Parameters :EndOfLoop -IF "%topdir%"=="" ( - IF EXIST tools\mkkconfig.bat ( - SET topdir=%cd% - ) ELSE ( - cd .. - IF %ERRORLEVEL% GTR 0 ( - Echo ERROR: failed cd .. - GOTO :End - ) - IF EXIST tools\mkkconfig.bat ( - SET topdir=%cd% - ) ELSE ( - Echo ERROR: Cannot find top directory - GOTO :End - ) - ) -) ELSE ( - IF NOT EXIST "%topdir%" ( - Echo ERROR: %topdir% does not EXIST - GOTO :End - ) - Cd %topdir% - IF %ERRORLEVEL% GTR 0 ( - Echo ERROR: failed cd %topdir% - GOTO :End - ) -) - IF EXIST %kconfig% ( Del /f /q %kconfig% REM IF %ERRORLEVEL% GTR 0 ( @@ -107,27 +79,40 @@ Echo # > %kconfig% Echo # For a description of the syntax of this configuration file, >> %kconfig% Echo # see the file kconfig-language.txt in the NuttX tools repository. >> %kconfig% Echo # >> %kconfig% +Echo # This file is autogenerated, do not edit. >> %kconfig% +Echo # >> %kconfig% +Echo >> %kconfig% + +IF %menu% NEQ "" ( + Echo menu "%menu%" >> %kconfig% +) DIR /B /A:D >_tmp_.dat Echo source "$APPSDIR/builtin/Kconfig" >> %kconfig% FOR /F "tokens=*" %%s IN (_tmp_.dat) do ( - if "%%s" NEQ "builtin" Echo source "$APPSDIR/%%s/Kconfig" >> %kconfig% + IF EXIST %%s\Kconfig ( + Echo source "$APPSDIR/%%s/Kconfig" >> %kconfig% + ) ) DEL _tmp_.dat +IF %menu% NEQ "" ( + Echo endmenu # %menu% >> %kconfig% +) + GOTO :End REM Exit showing usage :ShowUsage -Echo USAGE: %0 [-d] [-t ^] [-o ^] +Echo USAGE: %0 [-d] [-m ^] [-o ^] Echo %0 [-h] Echo Where: Echo ^<-d^>: Echo Enables debug output -Echo -t ^: -Echo Identifies the top applicatino directory +Echo -m ^: +Echo Menu description Echo -o ^: Echo Identifies the specific configuratin for the selected ^. Echo This must correspond to a sub-directory under the board directory at From 86e2a3594692a46ac7c1c72fc108583f9d67dff6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 6 Jun 2016 12:47:52 -0600 Subject: [PATCH 15/27] mkkconfig.bat: Clean up a few things --- tools/mkkconfig.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mkkconfig.bat b/tools/mkkconfig.bat index 69082e8c5..cc58b8527 100755 --- a/tools/mkkconfig.bat +++ b/tools/mkkconfig.bat @@ -35,7 +35,7 @@ REM REM Parse command line arguments -SET menu= +SET menu="" SET kconfig=Kconfig :ArgLoop @@ -81,7 +81,7 @@ Echo # see the file kconfig-language.txt in the NuttX tools repository. >> %kcon Echo # >> %kconfig% Echo # This file is autogenerated, do not edit. >> %kconfig% Echo # >> %kconfig% -Echo >> %kconfig% +Echo[ >> %kconfig% IF %menu% NEQ "" ( Echo menu "%menu%" >> %kconfig% From 29eb3f00f01ec41bb211b23de684983c7de1ca6c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 6 Jun 2016 12:52:33 -0600 Subject: [PATCH 16/27] Add a blank line --- interpreters/bas/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile index 0ef548393..f20c311cd 100644 --- a/interpreters/bas/Makefile +++ b/interpreters/bas/Makefile @@ -121,4 +121,5 @@ distclean: clean -include Make.dep .PHONY: preconfig + preconfig: From 8de50dc0cfa1e77e4876e1e1606e8569a840efa7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 7 Jun 2016 08:43:21 -0600 Subject: [PATCH 17/27] Add a default value for DELIM --- Makefile | 7 ++++++- netutils/thttpd/Makefile | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d8c848434..3f527d6cb 100644 --- a/Makefile +++ b/Makefile @@ -113,9 +113,14 @@ context_serialize: context: context_serialize -preconfig:$(foreach SDIR, $(BUILDIRS), $(SDIR)_preconfig) +$(TOPDIR)/.config: + +Kconfig: $(TOPDIR)/.config + $(foreach SDIR, $(BUILDIRS), $(SDIR)_preconfig) $(Q) $(MKKCONFIG) +preconfig: Kconfig + .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend) .depend: context Makefile .depdirs diff --git a/netutils/thttpd/Makefile b/netutils/thttpd/Makefile index 57425ec2e..44583ed15 100644 --- a/netutils/thttpd/Makefile +++ b/netutils/thttpd/Makefile @@ -35,6 +35,8 @@ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs + +DELIM = $(strip /) include $(APPDIR)$(DELIM)Make.defs # THTTPD Library From 33b876306db2272c77e8e14e82758178aec96090 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 7 Jun 2016 08:58:48 -0600 Subject: [PATCH 18/27] preconfig target only executes if .config file changes --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3f527d6cb..fc6fed558 100644 --- a/Makefile +++ b/Makefile @@ -78,12 +78,17 @@ BIN = libapps$(LIBEXT) all: $(BIN) .PHONY: import install context context_serialize context_rest .depdirs preconfig depend clean distclean +define MAKE_template + $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" + +endef + define SDIR_template $(1)_$(2): $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" + endef -$(foreach SDIR, $(BUILDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),install))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),context))) @@ -116,7 +121,7 @@ context: context_serialize $(TOPDIR)/.config: Kconfig: $(TOPDIR)/.config - $(foreach SDIR, $(BUILDIRS), $(SDIR)_preconfig) + $(foreach SDIR, $(BUILDIRS), $(call MAKE_template,$(SDIR),preconfig)) $(Q) $(MKKCONFIG) preconfig: Kconfig From c8d718b21173f24bbed7613e7229af92efaafebf Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 8 Jun 2016 08:56:20 -0600 Subject: [PATCH 19/27] Makefile: remove dependency on .config --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fc6fed558..1b580c0da 100644 --- a/Makefile +++ b/Makefile @@ -118,9 +118,7 @@ context_serialize: context: context_serialize -$(TOPDIR)/.config: - -Kconfig: $(TOPDIR)/.config +Kconfig: $(foreach SDIR, $(BUILDIRS), $(call MAKE_template,$(SDIR),preconfig)) $(Q) $(MKKCONFIG) From b5891c8b1a79c025309e56c721bf3f0be791ee58 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 8 Jun 2016 09:44:16 -0600 Subject: [PATCH 20/27] Eliminate some warnings --- system/hexed/src/hexed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/hexed/src/hexed.c b/system/hexed/src/hexed.c index ef2137349..a9a682576 100644 --- a/system/hexed/src/hexed.c +++ b/system/hexed/src/hexed.c @@ -229,7 +229,7 @@ int parseargs(FAR char *argv[]) FAR struct command_s *cmd; FAR char *fname; FAR char *opt; - int optc; + int optc = 0; fname = NULL; cmd = g_cmdtbl; From 0dfe0baf2b245b4075397e84c57e0af2f7bc12af Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 8 Jun 2016 18:02:37 -0600 Subject: [PATCH 21/27] apps/examples/ostest: SIG_DFL is no long assignment compatible with the sa_sigaction functin pointer. --- examples/ostest/posixtimer.c | 4 ++-- examples/ostest/sighand.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/ostest/posixtimer.c b/examples/ostest/posixtimer.c index 355cb8ec6..82eae67d9 100644 --- a/examples/ostest/posixtimer.c +++ b/examples/ostest/posixtimer.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/ostest/posixtimer.c * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -258,7 +258,7 @@ errorout: /* Detach the signal handler */ - act.sa_sigaction = SIG_DFL; + act.sa_handler = SIG_DFL; status = sigaction(MY_TIMER_SIGNAL, &act, &oact); printf("timer_test: done\n" ); diff --git a/examples/ostest/sighand.c b/examples/ostest/sighand.c index 138c54e73..0064c30aa 100644 --- a/examples/ostest/sighand.c +++ b/examples/ostest/sighand.c @@ -1,7 +1,7 @@ /**************************************************************************** * apps/examples/ostest/sighand.c * - * Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008, 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -213,7 +213,7 @@ static int waiter_main(int argc, char *argv[]) /* Detach the signal handler */ - act.sa_sigaction = SIG_DFL; + act.sa_handler = SIG_DFL; (void)sigaction(WAKEUP_SIGNAL, &act, &oact); printf("waiter_main: done\n" ); @@ -331,7 +331,7 @@ void sighand_test(void) /* Detach the signal handler */ #ifdef CONFIG_SCHED_HAVE_PARENT - act.sa_sigaction = SIG_DFL; + act.sa_handler = SIG_DFL; (void)sigaction(SIGCHLD, &act, &oact); #endif From 33c6a6bb758595aa8cb58f1905f9ec516d236735 Mon Sep 17 00:00:00 2001 From: Marten Svanfeldt Date: Mon, 19 Oct 2015 12:05:17 +0800 Subject: [PATCH 22/27] Make NSH net-initialization be a configuration option Signed-off-by: Marten Svanfeldt --- nshlib/Kconfig | 10 ++++++++++ nshlib/nsh.h | 2 +- nshlib/nsh_netinit.c | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nshlib/Kconfig b/nshlib/Kconfig index 81c14f173..eabdcb6f6 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -942,6 +942,15 @@ config NSH_ARCHINIT menu "Networking Configuration" depends on NET +config NSH_NETINIT + bool "Network initialization" + default y + depends on NET + ---help--- + This option enables/disables all network initialization in NSH. + +if NSH_NETINIT + config NSH_NETINIT_THREAD bool "Network initialization thread" default n @@ -1389,6 +1398,7 @@ config NSH_MACADDR MAC address must provided with this selection. endif # NSH_NOMAC +endif # NSH_NETINIT config NSH_MAX_ROUNDTRIP int "Max Ping Round-Trip (DSEC)" diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 1ed07a124..48166ea58 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -843,7 +843,7 @@ int nsh_romfsetc(void); # define nsh_romfsetc() (-ENOSYS) #endif -#ifdef CONFIG_NET +#ifdef CONFIG_NSH_NETINIT int nsh_netinit(void); #else # define nsh_netinit() (-ENOSYS) diff --git a/nshlib/nsh_netinit.c b/nshlib/nsh_netinit.c index 38e20aeb2..03e6b6c42 100644 --- a/nshlib/nsh_netinit.c +++ b/nshlib/nsh_netinit.c @@ -74,7 +74,7 @@ #include "nsh.h" -#ifdef CONFIG_NET +#ifdef CONFIG_NSH_NETINIT /**************************************************************************** * Pre-processor Definitions @@ -689,4 +689,4 @@ int nsh_netinit(void) #endif } -#endif /* CONFIG_NET */ +#endif /* CONFIG_NSH_NETINIT */ From 7a5ceb244ebc74e970e0ab77cf93d782f2b76bd3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 9 Jun 2016 08:13:42 -0600 Subject: [PATCH 23/27] Fix error in comment --- nshlib/nsh_fileapps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nshlib/nsh_fileapps.c b/nshlib/nsh_fileapps.c index 26db6e950..f32f0d494 100644 --- a/nshlib/nsh_fileapps.c +++ b/nshlib/nsh_fileapps.c @@ -88,7 +88,7 @@ * Attempt to execute the application task whose name is 'cmd' * * Returned Value: - * <0 If exec_builtin() fails, then the negated errno value + * <0 If posix_spawn() fails, then the negated errno value * is returned. * -1 (ERROR) if the application task corresponding to 'cmd' could not * be started (possibly because it doesn not exist). From bfd5ca7cd2abad2d90b6219be985508071574fb8 Mon Sep 17 00:00:00 2001 From: "David S. Alessio" Date: Thu, 9 Jun 2016 08:18:49 -0600 Subject: [PATCH 24/27] NTP Client: All retries; Add initialization in NSH network startup logic. --- netutils/ntpclient/ntpclient.c | 17 +++++++++++++++-- nshlib/nsh_netinit.c | 21 +++++++++++---------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c index 3aa700ee8..570938545 100644 --- a/netutils/ntpclient/ntpclient.c +++ b/netutils/ntpclient/ntpclient.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/ntpclient/ntpclient.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* NTP Time is seconds since 1900. Convert to Unix time which is seconds * since 1970 */ @@ -69,6 +70,7 @@ /**************************************************************************** * Private Types ****************************************************************************/ + /* This enumeration describes the state of the NTP daemon */ enum ntpc_daemon_e @@ -105,6 +107,7 @@ static struct ntpc_daemon_s g_ntpc_daemon; /**************************************************************************** * Private Functions ****************************************************************************/ + /**************************************************************************** * Name: ntpc_getuint32 * @@ -293,8 +296,9 @@ static int ntpc_daemon(int argc, char **argv) socklen_t socklen; ssize_t nbytes; int exitcode = EXIT_SUCCESS; - int ret; + int retry = 0; int sd; + int ret; /* Indicate that we have started */ @@ -428,6 +432,15 @@ static int ntpc_daemon(int argc, char **argv) int errval = errno; if (errval != EINTR) { + /* Allow up to three retries */ + + if (++retry < 3) + { + continue; + } + + /* Then declare the failure */ + ndbg("ERROR: recvfrom() failed: %d\n", errval); exitcode = EXIT_FAILURE; break; diff --git a/nshlib/nsh_netinit.c b/nshlib/nsh_netinit.c index 38e20aeb2..c30f813ad 100644 --- a/nshlib/nsh_netinit.c +++ b/nshlib/nsh_netinit.c @@ -1,7 +1,7 @@ /**************************************************************************** * apps/nshlib/nsh_netinit.c * - * Copyright (C) 2010-2012, 2014-2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2012, 2014-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * This is influenced by similar logic from uIP: @@ -72,6 +72,10 @@ # include #endif +#ifdef CONFIG_NETUTILS_NTPCLIENT +# include +#endif + #include "nsh.h" #ifdef CONFIG_NET @@ -128,7 +132,6 @@ # undef CONFIG_NSH_NETINIT_MONITOR #endif - /* We need a valid IP domain (any domain) to create a socket that we can use * to comunicate with the network device. */ @@ -147,10 +150,6 @@ #define LONG_TIME_SEC (60*60) /* One hour in seconds */ #define SHORT_TIME_SEC (2) /* 2 seconds */ -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Data ****************************************************************************/ @@ -203,10 +202,6 @@ static const uint16_t g_ipv6_netmask[8] = }; #endif /* CONFIG_NET_IPv6 && !CONFIG_NET_ICMPv6_AUTOCONF*/ -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -342,6 +337,12 @@ static void nsh_netinit_configure(void) dhcpc_close(handle); } #endif + +#ifdef CONFIG_NETUTILS_NTPCLIENT + /* Start the NTP client */ + + ntpc_start(); +#endif #endif /* NSH_HAVE_NETDEV */ nvdbg("Exit\n"); From 7ca5478da35776afdadb76cd950990646b15ed0b Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 9 Jun 2016 08:59:16 -0600 Subject: [PATCH 25/27] Rearrange to eliminate Kmenu files --- Directory.mk | 2 +- canutils/Kmenu | 1 - canutils/Makefile | 2 ++ examples/Kmenu | 1 - examples/Makefile | 2 ++ fsutils/Kmenu | 1 - fsutils/Makefile | 2 ++ gpsutils/Kmenu | 1 - gpsutils/Makefile | 2 ++ graphics/Kmenu | 1 - graphics/Makefile | 2 ++ interpreters/Kmenu | 1 - interpreters/Makefile | 2 ++ netutils/Kmenu | 1 - netutils/Makefile | 2 ++ system/Kmenu | 1 - system/Makefile | 2 ++ 17 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 canutils/Kmenu delete mode 100644 examples/Kmenu delete mode 100644 fsutils/Kmenu delete mode 100644 gpsutils/Kmenu delete mode 100644 graphics/Kmenu delete mode 100644 interpreters/Kmenu delete mode 100644 netutils/Kmenu delete mode 100644 system/Kmenu diff --git a/Directory.mk b/Directory.mk index e02230dd0..eb528b696 100644 --- a/Directory.mk +++ b/Directory.mk @@ -60,7 +60,7 @@ nothing: install: preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig) - $(Q) $(MKKCONFIG) -m "$(shell cat Kmenu)" + $(Q) $(MKKCONFIG) -m $(MENUDESC) context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context) diff --git a/canutils/Kmenu b/canutils/Kmenu deleted file mode 100644 index 695c934b6..000000000 --- a/canutils/Kmenu +++ /dev/null @@ -1 +0,0 @@ -CAN Utilities diff --git a/canutils/Makefile b/canutils/Makefile index abe102db3..19e8bab6b 100644 --- a/canutils/Makefile +++ b/canutils/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "CAN Utilities" + include $(APPDIR)/Directory.mk diff --git a/examples/Kmenu b/examples/Kmenu deleted file mode 100644 index ad6b7fb4b..000000000 --- a/examples/Kmenu +++ /dev/null @@ -1 +0,0 @@ -Examples diff --git a/examples/Makefile b/examples/Makefile index 70315d06c..501c30ac9 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "Examples" + include $(APPDIR)/Directory.mk diff --git a/fsutils/Kmenu b/fsutils/Kmenu deleted file mode 100644 index 4e61ee913..000000000 --- a/fsutils/Kmenu +++ /dev/null @@ -1 +0,0 @@ -File System Utilities diff --git a/fsutils/Makefile b/fsutils/Makefile index 55351c3f3..f7e640083 100644 --- a/fsutils/Makefile +++ b/fsutils/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "File System Utilities" + include $(APPDIR)/Directory.mk diff --git a/gpsutils/Kmenu b/gpsutils/Kmenu deleted file mode 100644 index 3fd21d77b..000000000 --- a/gpsutils/Kmenu +++ /dev/null @@ -1 +0,0 @@ -GPS Utilities diff --git a/gpsutils/Makefile b/gpsutils/Makefile index f34706ee0..3d85b0b0d 100644 --- a/gpsutils/Makefile +++ b/gpsutils/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "GPS Utilities" + include $(APPDIR)/Directory.mk diff --git a/graphics/Kmenu b/graphics/Kmenu deleted file mode 100644 index 453def533..000000000 --- a/graphics/Kmenu +++ /dev/null @@ -1 +0,0 @@ -Graphics Support diff --git a/graphics/Makefile b/graphics/Makefile index 60b1c91ae..dfff4b917 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "Graphics Support" + include $(APPDIR)/Directory.mk diff --git a/interpreters/Kmenu b/interpreters/Kmenu deleted file mode 100644 index ec50152c2..000000000 --- a/interpreters/Kmenu +++ /dev/null @@ -1 +0,0 @@ -Interpreters diff --git a/interpreters/Makefile b/interpreters/Makefile index 0e499e268..edd4ec0c6 100644 --- a/interpreters/Makefile +++ b/interpreters/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "Interpreters" + include $(APPDIR)/Directory.mk diff --git a/netutils/Kmenu b/netutils/Kmenu deleted file mode 100644 index 3919aa206..000000000 --- a/netutils/Kmenu +++ /dev/null @@ -1 +0,0 @@ -Network Utilities diff --git a/netutils/Makefile b/netutils/Makefile index 3cab860f7..ce267013b 100644 --- a/netutils/Makefile +++ b/netutils/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "Network Utilities" + include $(APPDIR)/Directory.mk diff --git a/system/Kmenu b/system/Kmenu deleted file mode 100644 index 038615da8..000000000 --- a/system/Kmenu +++ /dev/null @@ -1 +0,0 @@ -System Libraries and NSH Add-Ons diff --git a/system/Makefile b/system/Makefile index eae61b31c..2bbcf2c8a 100644 --- a/system/Makefile +++ b/system/Makefile @@ -33,4 +33,6 @@ # ############################################################################ +MENUDESC = "System Libraries and NSH Add-Ons" + include $(APPDIR)/Directory.mk From d2aa24ad88f32add1d944c4885ec11c660841569 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Thu, 9 Jun 2016 10:51:04 -0600 Subject: [PATCH 26/27] Make sure that APPNAME is defined in all Makefiles that generate applications --- examples/configdata/Makefile | 2 ++ examples/hidkbd/Makefile | 2 ++ examples/mm/Makefile | 2 ++ examples/mount/Makefile | 2 ++ examples/mtdpart/Makefile | 6 ++++-- examples/mtdpart/mtdpart_main.c | 6 +----- examples/mtdrwb/Makefile | 6 ++++-- examples/nsh/Makefile | 2 ++ examples/nxffs/Makefile | 6 ++++-- examples/pashello/Makefile | 2 ++ examples/pipe/Makefile | 2 ++ examples/rgmp/Makefile | 2 ++ examples/sendmail/Makefile | 2 ++ examples/serloop/Makefile | 2 ++ examples/smart/Makefile | 2 ++ examples/uavcan/Makefile | 2 ++ examples/wget/Makefile | 2 ++ nshlib/Kconfig | 2 +- 18 files changed, 40 insertions(+), 12 deletions(-) diff --git a/examples/configdata/Makefile b/examples/configdata/Makefile index d3a23e212..fa0bb9efc 100644 --- a/examples/configdata/Makefile +++ b/examples/configdata/Makefile @@ -37,6 +37,8 @@ # CONFIGDATA Unit Test +APPNAME = configdata + ASRCS = CSRCS = MAINSRC = configdata_main.c diff --git a/examples/hidkbd/Makefile b/examples/hidkbd/Makefile index 32fd923a6..8b0298ea9 100644 --- a/examples/hidkbd/Makefile +++ b/examples/hidkbd/Makefile @@ -37,6 +37,8 @@ # USB Host HID keyboard Example +APPNAME = hidkbd + ASRCS = CSRCS = MAINSRC = hidkbd_main.c diff --git a/examples/mm/Makefile b/examples/mm/Makefile index 3f86b95f7..1a832863b 100644 --- a/examples/mm/Makefile +++ b/examples/mm/Makefile @@ -37,6 +37,8 @@ # Memory Management Test +APPNAME = mm + ASRCS = CSRCS = MAINSRC = mm_main.c diff --git a/examples/mount/Makefile b/examples/mount/Makefile index 295389c60..900dae568 100644 --- a/examples/mount/Makefile +++ b/examples/mount/Makefile @@ -37,6 +37,8 @@ # mount() test +APPNAME = mount + ASRCS = CSRCS = ramdisk.c MAINSRC = mount_main.c diff --git a/examples/mtdpart/Makefile b/examples/mtdpart/Makefile index 3a5a2f2af..eff6cdc29 100755 --- a/examples/mtdpart/Makefile +++ b/examples/mtdpart/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/mtdpart/Makefile # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,9 @@ -include $(TOPDIR)/Make.defs -# Hello, World! Example +# MTD Partition Example + +APPNAME = mtdpart ASRCS = CSRCS = diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c index 66edadb5c..b600875e4 100644 --- a/examples/mtdpart/mtdpart_main.c +++ b/examples/mtdpart/mtdpart_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/mtdpart/mtdpart_main.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -127,10 +127,6 @@ static uint8_t g_simflash[MTDPART_BUFSIZE]; extern FAR struct mtd_dev_s *mtdpart_archinitialize(void); #endif -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/examples/mtdrwb/Makefile b/examples/mtdrwb/Makefile index c284910b8..ad5767ddd 100755 --- a/examples/mtdrwb/Makefile +++ b/examples/mtdrwb/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examplex/mtdrwb/Makefile # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,9 @@ -include $(TOPDIR)/Make.defs -# Hello, World! Example +# MTD R/W buffer test Example + +APPNAME = mtdrwb ASRCS = CSRCS = diff --git a/examples/nsh/Makefile b/examples/nsh/Makefile index bfb6958a7..1baad89b9 100644 --- a/examples/nsh/Makefile +++ b/examples/nsh/Makefile @@ -37,6 +37,8 @@ # NuttShell (NSH) Example +APPNAME = nsh + ASRCS = CSRCS = MAINSRC = nsh_main.c diff --git a/examples/nxffs/Makefile b/examples/nxffs/Makefile index 045d3a55b..1227d2714 100644 --- a/examples/nxffs/Makefile +++ b/examples/nxffs/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/nxffs/Makefile # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,9 @@ -include $(TOPDIR)/Make.defs -# Hello, World! Example +# NXFFS file system example + +APPNAME = nxffs ASRCS = CSRCS = diff --git a/examples/pashello/Makefile b/examples/pashello/Makefile index 403173867..95ad4754d 100644 --- a/examples/pashello/Makefile +++ b/examples/pashello/Makefile @@ -37,6 +37,8 @@ # Pascal Add-On Example +APPNAME = pashello + ifeq ($(WINTOOL),y) INCDIROPT = -w endif diff --git a/examples/pipe/Makefile b/examples/pipe/Makefile index 62d1ac584..08d5216aa 100644 --- a/examples/pipe/Makefile +++ b/examples/pipe/Makefile @@ -37,6 +37,8 @@ # Pipe Example +APPNAME = pipe + ASRCS = CSRCS = transfer_test.c interlock_test.c redirect_test.c MAINSRC = pipe_main.c diff --git a/examples/rgmp/Makefile b/examples/rgmp/Makefile index 2cc19a0cf..b435ad3f8 100644 --- a/examples/rgmp/Makefile +++ b/examples/rgmp/Makefile @@ -37,6 +37,8 @@ # The smallest thing you can build -- the NULL example. +APPNAME = rgmp + ASRCS = CSRCS = MAINSRC = rgmp_main.c diff --git a/examples/sendmail/Makefile b/examples/sendmail/Makefile index 3a0430744..87d66431a 100644 --- a/examples/sendmail/Makefile +++ b/examples/sendmail/Makefile @@ -37,6 +37,8 @@ # Sendmail SMTP Example +APPNAME = sendmail + ASRCS = CSRCS = MAINSRC = sendmail_main.c diff --git a/examples/serloop/Makefile b/examples/serloop/Makefile index 716e2622b..102a2474e 100644 --- a/examples/serloop/Makefile +++ b/examples/serloop/Makefile @@ -37,6 +37,8 @@ # Mindlessly simple console loopack test +APPNAME = serloop + ASRCS = CSRCS = MAINSRC = serloop_main.c diff --git a/examples/smart/Makefile b/examples/smart/Makefile index e612c8e5a..0f30aca86 100644 --- a/examples/smart/Makefile +++ b/examples/smart/Makefile @@ -37,6 +37,8 @@ # SMART file system stress test +APPNAME = smart + ASRCS = CSRCS = MAINSRC = smart_main.c diff --git a/examples/uavcan/Makefile b/examples/uavcan/Makefile index 8d5df1888..1d1712f2b 100644 --- a/examples/uavcan/Makefile +++ b/examples/uavcan/Makefile @@ -35,6 +35,8 @@ -include $(TOPDIR)/Make.defs +APPNAME = uavcan + MAINSRC = uavcan_main.cxx CXXFLAGS += -I$(TOPDIR)/include/apps diff --git a/examples/wget/Makefile b/examples/wget/Makefile index 9fa488e41..368550634 100644 --- a/examples/wget/Makefile +++ b/examples/wget/Makefile @@ -41,6 +41,8 @@ ASRCS = CSRCS = MAINSRC = wget_main.c +APPNAME = wget + CONFIG_XYZ_PROGNAME ?= wget$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) diff --git a/nshlib/Kconfig b/nshlib/Kconfig index eabdcb6f6..cf6788248 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -947,7 +947,7 @@ config NSH_NETINIT default y depends on NET ---help--- - This option enables/disables all network initialization in NSH. + This option enables/disables all network initialization in NSH. if NSH_NETINIT From 406ac81fb38df387d9c9432303ad64cd5c003c55 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 9 Jun 2016 13:26:22 -0600 Subject: [PATCH 27/27] Update ChangeLog --- ChangeLog.txt | 15 +++++++++------ system/hex2bin/hex2bin_main.c | 8 -------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 9815bd2a7..69a233608 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1620,9 +1620,12 @@ definiitions (2016-06-05). * Many files: Change to the way that Kconfig files are generated in order to better support reuse of the apps/ directory in NuttX products. Changes - include: add kmenu files, make the full tree use wildcards make.defs, Add - empty preconfig rules to 'leaf' makefiles, Use directory.mk for recursive - dir makefiles, Individual app kconfig fixes, Recursive Kconfig - autogeneration, Add kconfig files for pcode and tiff, and fix a gitignore - rule, From Sébastien Lorquet (2016-06-06). - + include: Make the full tree use wildcards make.defs, Add empty preconfig + rules to 'leaf' makefiles, Use directory.mk for recursive dir makefiles, + Individual app kconfig fixes, Recursive Kconfig autogeneration, Add + kconfig files for pcode and tiff, and fix a gitignore rule, From + Sébastien Lorquet (2016-06-06). + * apps/nshlib: Make NSH net-initialization be a configuration option. From + Marten Svanfeld (2016-06-09). + * netutils/ntpc and nshlib: NTP Client: All retries; Add initialization + in NSH network startup logic. From David S. Alessio (2016-06-09) . diff --git a/system/hex2bin/hex2bin_main.c b/system/hex2bin/hex2bin_main.c index 6610491e4..762491e27 100644 --- a/system/hex2bin/hex2bin_main.c +++ b/system/hex2bin/hex2bin_main.c @@ -49,14 +49,6 @@ #ifdef CONFIG_SYSTEM_HEX2BIN_BUILTIN -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/