change a way to refer make.defs in external folders

diff --git a/apps/builtin/Make.defs b/apps/builtin/Make.defs
index 6c11917..f1157c7 100644 (file)
--- a/apps/builtin/Make.defs
+++ b/apps/builtin/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/builtin/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs
index 3048923..a91a138 100644 (file)
--- a/apps/examples/Make.defs
+++ b/apps/examples/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/aws/Make.defs b/apps/examples/aws/Make.defs
index fe24082..334b9fe 100644 (file)
--- a/apps/examples/aws/Make.defs
+++ b/apps/examples/aws/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/aws/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/dnsclient_test/Make.defs b/apps/examples/dnsclient_test/Make.defs
index 19971ad..5877753 100644 (file)
--- a/apps/examples/dnsclient_test/Make.defs
+++ b/apps/examples/dnsclient_test/Make.defs
@@ -1,6 +1,6 @@
 ############################################################################
 # apps/examples/dnsclient_test/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/eeprom_test/Make.defs b/apps/examples/eeprom_test/Make.defs
index 8575982..d85891d 100644 (file)
--- a/apps/examples/eeprom_test/Make.defs
+++ b/apps/examples/eeprom_test/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/eeprom_test/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/ftpc/Make.defs b/apps/examples/ftpc/Make.defs
index d2fdd5e..ae40e9e 100644 (file)
--- a/apps/examples/ftpc/Make.defs
+++ b/apps/examples/ftpc/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/ftpc/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/ftpd/Make.defs b/apps/examples/ftpd/Make.defs
index e71ec45..6ed934e 100644 (file)
--- a/apps/examples/ftpd/Make.defs
+++ b/apps/examples/ftpd/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/ftpd/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/hello/Make.defs b/apps/examples/hello/Make.defs
index c2b4e12..cba6dc6 100644 (file)
--- a/apps/examples/hello/Make.defs
+++ b/apps/examples/hello/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/hello/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/helloxx/Make.defs b/apps/examples/helloxx/Make.defs
index b12056b..124df06 100644 (file)
--- a/apps/examples/helloxx/Make.defs
+++ b/apps/examples/helloxx/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/helloxx/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/iotbus_test/Make.defs b/apps/examples/iotbus_test/Make.defs
index 1c36ffe..a1d3fb6 100644 (file)
--- a/apps/examples/iotbus_test/Make.defs
+++ b/apps/examples/iotbus_test/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/iotbus_test/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/nettest/Make.defs b/apps/examples/nettest/Make.defs
index 330a42a..7604bdf 100644 (file)
--- a/apps/examples/nettest/Make.defs
+++ b/apps/examples/nettest/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/nettest/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/smart/Make.defs b/apps/examples/smart/Make.defs
index a58dabc..3f60f6f 100644 (file)
--- a/apps/examples/smart/Make.defs
+++ b/apps/examples/smart/Make.defs
@@ -1,6 +1,6 @@
 ############################################################################
 # apps/examples/smart/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/telnetd/Make.defs b/apps/examples/telnetd/Make.defs
index e5d6b66..5d81709 100644 (file)
--- a/apps/examples/telnetd/Make.defs
+++ b/apps/examples/telnetd/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/telnetd/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/webserver/Make.defs b/apps/examples/webserver/Make.defs
index 11a1230..1d9894d 100644 (file)
--- a/apps/examples/webserver/Make.defs
+++ b/apps/examples/webserver/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/webserver/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/examples/xmlrpc/Make.defs b/apps/examples/xmlrpc/Make.defs
index a1a46cd..540101a 100644 (file)
--- a/apps/examples/xmlrpc/Make.defs
+++ b/apps/examples/xmlrpc/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/examples/xmlrpc/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs
index 8bbf0ae..763f2e4 100644 (file)
--- a/apps/netutils/Make.defs
+++ b/apps/netutils/Make.defs
@@ -16,8 +16,8 @@
 #
 ###########################################################################
 ############################################################################
-# external/Make.defs
-# Adds selected applications to external/ build
+# apps/netutils/Make.defs
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/platform/Make.defs b/apps/platform/Make.defs
index 40fed56..1155045 100644 (file)
--- a/apps/platform/Make.defs
+++ b/apps/platform/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/platform/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/Make.defs b/apps/system/Make.defs
index 38a1f8d..9d045ba 100644 (file)
--- a/apps/system/Make.defs
+++ b/apps/system/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/cle/Make.defs b/apps/system/cle/Make.defs
index 79845dc..bf944f9 100644 (file)
--- a/apps/system/cle/Make.defs
+++ b/apps/system/cle/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/cle/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/cu/Make.defs b/apps/system/cu/Make.defs
index e642d66..68df06e 100644 (file)
--- a/apps/system/cu/Make.defs
+++ b/apps/system/cu/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/cu/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/flash_eraseall/Make.defs b/apps/system/flash_eraseall/Make.defs
index a811f4c..9e54d26 100644 (file)
--- a/apps/system/flash_eraseall/Make.defs
+++ b/apps/system/flash_eraseall/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/flash_eraseall/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/i2c/Make.defs b/apps/system/i2c/Make.defs
index 128d083..474107f 100644 (file)
--- a/apps/system/i2c/Make.defs
+++ b/apps/system/i2c/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/i2c/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/install/Make.defs b/apps/system/install/Make.defs
index 9e43428..2d17388 100644 (file)
--- a/apps/system/install/Make.defs
+++ b/apps/system/install/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/install/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/mdio/Make.defs b/apps/system/mdio/Make.defs
index a8d893b..1b303a9 100644 (file)
--- a/apps/system/mdio/Make.defs
+++ b/apps/system/mdio/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/mdio/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/netdb/Make.defs b/apps/system/netdb/Make.defs
index 59e88b3..e24797a 100644 (file)
--- a/apps/system/netdb/Make.defs
+++ b/apps/system/netdb/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/netdb/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/ramtest/Make.defs b/apps/system/ramtest/Make.defs
index 52fa035..767ac57 100644 (file)
--- a/apps/system/ramtest/Make.defs
+++ b/apps/system/ramtest/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/ramtest/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/readline/Make.defs b/apps/system/readline/Make.defs
index 2ec2b52..6e77c07 100644 (file)
--- a/apps/system/readline/Make.defs
+++ b/apps/system/readline/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/readline/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/apps/system/vi/Make.defs b/apps/system/vi/Make.defs
index 81de000..b0bb771 100644 (file)
--- a/apps/system/vi/Make.defs
+++ b/apps/system/vi/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 ############################################################################
 # apps/system/vi/Make.defs
-# Adds selected applications to external/ build
+# Adds selected applications to apps/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

diff --git a/external/Makefile b/external/Makefile
index dc6faa8..c0ad111 100644 (file)
--- a/external/Makefile
+++ b/external/Makefile
@@ -81,25 +81,77 @@ ifeq ($(CONFIG_NETUTILS_WIFI),y)
 include slsi_wifi/Make.defs
 endif
 
+ifeq ($(CONFIG_NETUTILS_DHCPD),y)
 include dhcpd/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_XMLRPC),y)
 include xmlrpc/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y)
 include ntpclient/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_WEBSERVER),y)
 include webserver/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_FTPC),y)
 include ftpc/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_MDNS),y)
 include mdns/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)
 include webclient/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_MQTT),y)
 include mosquitto/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_FTPD),y)
 include ftpd/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_DHCPC),y)
 include dhcpc/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_WEBSOCKET),y)
 include websocket/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_LIBCOAP),y)
 include libcoap/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_TFTPC),y)
 include tftpc/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_TELNETD),y)
 include telnetd/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_SMTP),y)
 include smtp/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_NETLIB),y)
 include netlib/Make.defs
+endif
+
+ifeq ($(CONFIG_NETUTILS_JSON),y)
 include json/Make.defs
-include mbedtls/Make.defs
+endif
 
+ifeq ($(CONFIG_NET_SECURITY_TLS),y)
+include mbedtls/Make.defs
+endif
 
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 COBJS = $(CSRCS:.c=$(OBJEXT))

diff --git a/external/dhcpc/Make.defs b/external/dhcpc/Make.defs
index 9d692a0..b46110f 100644 (file)
--- a/external/dhcpc/Make.defs
+++ b/external/dhcpc/Make.defs
@@ -50,12 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_DHCPC),y)
-
 CSRCS += dhcpc/dhcpc.c
 
 DEPPATH += --dep-path dhcpc
 VPATH += :dhcpc
 
-endif
-

diff --git a/external/dhcpd/Make.defs b/external/dhcpd/Make.defs
index acd32d3..12057b6 100644 (file)
--- a/external/dhcpd/Make.defs
+++ b/external/dhcpd/Make.defs
@@ -50,12 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_DHCPD),y)
-
 CSRCS += dhcpd/dhcpd.c
 
 DEPPATH += --dep-path dhcpd
 VPATH += :dhcpd
 
-endif
-

diff --git a/external/ftpc/Make.defs b/external/ftpc/Make.defs
index b83109b..a24eb24 100644 (file)
--- a/external/ftpc/Make.defs
+++ b/external/ftpc/Make.defs
@@ -50,8 +50,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_FTPC),y)
-
 # FTP connection management
 CSRCS += ftpc/ftpc_connect.c \
          ftpc/ftpc_disconnect.c
@@ -91,5 +89,3 @@ CSRCS += ftpc/ftpc_utils.c \
 DEPPATH += --dep-path ftpc
 VPATH += :ftpc
 
-endif
-

diff --git a/external/ftpd/Make.defs b/external/ftpd/Make.defs
index 56822a8..808e377 100644 (file)
--- a/external/ftpd/Make.defs
+++ b/external/ftpd/Make.defs
@@ -50,8 +50,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_FTPD),y)
-
 ifeq ($(CONFIG_NET_LWIP),y)
 CSRCS          += ftpd/ftpd.c
 endif
@@ -59,5 +57,3 @@ endif
 DEPPATH += --dep-path ftpd
 VPATH += :ftpd
 
-endif
-

diff --git a/external/include/protocols/ipmsfilter.h b/external/include/netutils/ipmsfilter.h
similarity index 100%
rename from external/include/protocols/ipmsfilter.h
rename to external/include/netutils/ipmsfilter.h

diff --git a/external/json/Make.defs b/external/json/Make.defs
index dd7039c..4c3493c 100644 (file)
--- a/external/json/Make.defs
+++ b/external/json/Make.defs
@@ -50,12 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_JSON),y)
-
 CSRCS += json/cJSON.c
 
 DEPPATH += --dep-path json
 VPATH += :json
 
-endif
-

diff --git a/external/libcoap/Make.defs b/external/libcoap/Make.defs
index a6d148d..40d675b 100644 (file)
--- a/external/libcoap/Make.defs
+++ b/external/libcoap/Make.defs
@@ -50,8 +50,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_LIBCOAP),y)
-
 CSRCS += libcoap/async.c
 CSRCS += libcoap/block.c
 CSRCS += libcoap/coap_list.c
@@ -69,6 +67,3 @@ CSRCS += libcoap/uri.c
 DEPPATH += --dep-path libcoap
 VPATH += :libcoap
 
-endif
-
-

diff --git a/external/mbedtls/Make.defs b/external/mbedtls/Make.defs
index a3e8643..133f020 100644 (file)
--- a/external/mbedtls/Make.defs
+++ b/external/mbedtls/Make.defs
@@ -17,7 +17,7 @@
 ###########################################################################
 
 ############################################################################
-# net/tls/make.defs
+# external/mbedtls/make.defs
 #
 #   Copyright (C) 2007, 2008, 2011-2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NET_SECURITY_TLS),y)
 SRC_CRYPTO_CSRCS =    mbedtls/aes.c           mbedtls/aesni.c         mbedtls/arc4.c          \
                       mbedtls/asn1parse.c     mbedtls/asn1write.c     mbedtls/base64.c        \
                       mbedtls/bignum.c        mbedtls/blowfish.c      mbedtls/camellia.c      \
@@ -91,4 +90,3 @@ CSRCS += $(TLS_CSRCS)
 DEPPATH += --dep-path mbedtls
 VPATH += :mbedtls
 
-endif

diff --git a/external/mdns/Make.defs b/external/mdns/Make.defs
index 610b52b..bd867d7 100644 (file)
--- a/external/mdns/Make.defs
+++ b/external/mdns/Make.defs
@@ -16,11 +16,8 @@
 #
 ###########################################################################
 
-ifeq ($(CONFIG_NETUTILS_MDNS),y)
-
 CSRCS += mdns/mdns.c mdns/mdnsd.c
 
 DEPPATH += --dep-path mdns
 VPATH += :mdns
 
-endif

diff --git a/external/mosquitto/Make.defs b/external/mosquitto/Make.defs
index 0fd81eb..1f42e38 100644 (file)
--- a/external/mosquitto/Make.defs
+++ b/external/mosquitto/Make.defs
@@ -50,8 +50,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_MQTT),y)
-
 include mosquitto/config.mk
 
 CSRCS += mosquitto/tls_mosq.c
@@ -72,10 +70,6 @@ CSRCS += mosquitto/read_handle.c
 CSRCS += mosquitto/time_mosq.c
 CSRCS += mosquitto/memory_mosq.c
 
-#CFLAGS += -Imosquitto
-
 DEPPATH += --dep-path mosquitto
 VPATH += :mosquitto
 
-endif
-

diff --git a/external/netlib/Make.defs b/external/netlib/Make.defs
index 3781ed3..8f07f0c 100644 (file)
--- a/external/netlib/Make.defs
+++ b/external/netlib/Make.defs
@@ -50,8 +50,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_NETLIB),y)
-
 CSRCS += netlib/netlib.c
 CSRCS += netlib/netlib_parsehttpurl.c
 CSRCS += netlib/netlib_setifstatus.c \
@@ -95,6 +93,3 @@ endif
 DEPPATH += --dep-path netlib
 VPATH += :netlib
 
-
-endif
-

diff --git a/external/netlib/netlib_ipmsfilter.c b/external/netlib/netlib_ipmsfilter.c
index ac12b45..377f3cb 100644 (file)
--- a/external/netlib/netlib_ipmsfilter.c
+++ b/external/netlib/netlib_ipmsfilter.c
@@ -69,7 +69,7 @@
 #include <sys/sockio.h>
 
 #include <netutils/netlib.h>
-#include <protocols/ipmsfilter.h>
+#include <netutils/ipmsfilter.h>
 
 #ifdef CONFIG_NET_IGMP
 

diff --git a/external/ntpclient/Make.defs b/external/ntpclient/Make.defs
index 530499e..c95049e 100644 (file)
--- a/external/ntpclient/Make.defs
+++ b/external/ntpclient/Make.defs
@@ -50,12 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y)
-
 CSRCS += ntpclient/ntpclient.c
 
 DEPPATH += --dep-path ntpclient
 VPATH += :ntpclient
 
-endif
-

diff --git a/external/smtp/Make.defs b/external/smtp/Make.defs
index 1e9c710..3233507 100644 (file)
--- a/external/smtp/Make.defs
+++ b/external/smtp/Make.defs
@@ -50,12 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_SMTP),y)
-
 CSRCS  += smtp/smtp.c
 
 DEPPATH += --dep-path smtp
 VPATH += :smtp
 
-endif
-

diff --git a/external/telnetd/Make.defs b/external/telnetd/Make.defs
index c6b7d14..661651a 100644 (file)
--- a/external/telnetd/Make.defs
+++ b/external/telnetd/Make.defs
@@ -50,13 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_TELNETD),y)
-CONFIGURED_APPS += netutils/telnetd
-
 CSRCS          += telnetd/telnetd_daemon.c
 
 DEPPATH += --dep-path telnetd
 VPATH += :telnetd
 
-endif
-

diff --git a/external/tftpc/Make.defs b/external/tftpc/Make.defs
index 67b6216..e005c59 100644 (file)
--- a/external/tftpc/Make.defs
+++ b/external/tftpc/Make.defs
@@ -50,12 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_TFTPC),y)
-
 CSRCS += tftpc/tftpc_get.c tftpc/tftpc_put.c tftpc/tftpc_packets.c
 
 DEPPATH += --dep-path tftpc
 VPATH += :tftpc
 
-endif
-

diff --git a/external/webclient/Make.defs b/external/webclient/Make.defs
index d481dd3..5201594 100644 (file)
--- a/external/webclient/Make.defs
+++ b/external/webclient/Make.defs
@@ -50,14 +50,8 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)
-
-ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)
 CSRCS  += webclient/webclient.c
-endif
 
 DEPPATH += --dep-path webclient
 VPATH += :webclient
 
-endif
-

diff --git a/external/webserver/Make.defs b/external/webserver/Make.defs
index d061a73..8b21607 100644 (file)
--- a/external/webserver/Make.defs
+++ b/external/webserver/Make.defs
@@ -50,10 +50,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_WEBSERVER),y)
-CONFIGURED_APPS += netutils/webserver
-
-ifeq ($(CONFIG_NETUTILS_WEBSERVER),y)
 CSRCS  += webserver/http.c
 CSRCS   += webserver/http_server.c
 CSRCS   += webserver/http_client.c
@@ -64,10 +60,7 @@ endif
 CSRCS   += webserver/http_string_util.c
 CSRCS   += webserver/http_keyvalue_list.c
 CSRCS   += webserver/http_query.c
-endif
 
 DEPPATH += --dep-path webserver
 VPATH += :webserver
 
-endif
-

diff --git a/external/websocket/Make.defs b/external/websocket/Make.defs
index c6c7aa8..d5ead98 100644 (file)
--- a/external/websocket/Make.defs
+++ b/external/websocket/Make.defs
@@ -16,9 +16,6 @@
 #
 ###########################################################################
 
-ifeq ($(CONFIG_NETUTILS_WEBSOCKET),y)
-CONFIGURED_APPS += netutils/websocket
-
 CSRCS += websocket/websocket.c
 CSRCS += websocket/wslay/wslay_net.c \
          websocket/wslay/wslay_queue.c \
@@ -28,5 +25,3 @@ CSRCS += websocket/wslay/wslay_net.c \
 DEPPATH += --dep-path websocket
 VPATH += :websocket
 
-endif
-

diff --git a/external/xmlrpc/Make.defs b/external/xmlrpc/Make.defs
index c9b4cab..a7fb454 100644 (file)
--- a/external/xmlrpc/Make.defs
+++ b/external/xmlrpc/Make.defs
@@ -51,13 +51,9 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_NETUTILS_XMLRPC),y)
-
 CSRCS += xmlrpc/xmlparser.c \
          xmlrpc/response.c
 
 DEPPATH += --dep-path xmlrpc
 VPATH += :xmlrpc
 
-endif
-