external/protocols: fix wrong path of CSRCS

There is a deppath and a VPATH so that CSRCS path should be a base on
each folder, not from external.

diff --git a/external/dhcpc/Make.defs b/external/dhcpc/Make.defs
index b46110f..c192705 100644 (file)
--- a/external/dhcpc/Make.defs
+++ b/external/dhcpc/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS += dhcpc/dhcpc.c
+CSRCS += dhcpc.c
 
 DEPPATH += --dep-path dhcpc
 VPATH += :dhcpc

diff --git a/external/dhcpd/Make.defs b/external/dhcpd/Make.defs
index 12057b6..358a72d 100644 (file)
--- a/external/dhcpd/Make.defs
+++ b/external/dhcpd/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS += dhcpd/dhcpd.c
+CSRCS += dhcpd.c
 
 DEPPATH += --dep-path dhcpd
 VPATH += :dhcpd

diff --git a/external/ftpc/Make.defs b/external/ftpc/Make.defs
index a24eb24..534292e 100644 (file)
--- a/external/ftpc/Make.defs
+++ b/external/ftpc/Make.defs
@@ -51,40 +51,40 @@
 ############################################################################
 
 # FTP connection management
-CSRCS += ftpc/ftpc_connect.c \
-         ftpc/ftpc_disconnect.c
+CSRCS += ftpc_connect.c \
+         ftpc_disconnect.c
 
 # FTP commands
-CSRCS += ftpc/ftpc_cdup.c \
-         ftpc/ftpc_chdir.c \
-         ftpc/ftpc_chmod.c \
-         ftpc/ftpc_filesize.c \
-         ftpc/ftpc_filetime.c
-CSRCS += ftpc/ftpc_help.c \
-         ftpc/ftpc_idle.c \
-         ftpc/ftpc_listdir.c \
-         ftpc/ftpc_login.c \
-         ftpc/ftpc_mkdir.c
-CSRCS += ftpc/ftpc_noop.c \
-         ftpc/ftpc_rpwd.c \
-         ftpc/ftpc_quit.c \
-         ftpc/ftpc_rename.c \
-         ftpc/ftpc_rmdir.c \
-         ftpc/ftpc_unlink.c
-CSRCS += ftpc/ftpc_cmd.c
+CSRCS += ftpc_cdup.c \
+         ftpc_chdir.c \
+         ftpc_chmod.c \
+         ftpc_filesize.c \
+         ftpc_filetime.c
+CSRCS += ftpc_help.c \
+         ftpc_idle.c \
+         ftpc_listdir.c \
+         ftpc_login.c \
+         ftpc_mkdir.c
+CSRCS += ftpc_noop.c \
+         ftpc_rpwd.c \
+         ftpc_quit.c \
+         ftpc_rename.c \
+         ftpc_rmdir.c \
+         ftpc_unlink.c
+CSRCS += ftpc_cmd.c
 
 # FTP transfers
-CSRCS += ftpc/ftpc_getfile.c \
-         ftpc/ftpc_putfile.c \
-         ftpc/ftpc_transfer.c
+CSRCS += ftpc_getfile.c \
+         ftpc_putfile.c \
+         ftpc_transfer.c
 
 # FTP responses
-CSRCS += ftpc/ftpc_response.c \
-         ftpc/ftpc_getreply.c
+CSRCS += ftpc_response.c \
+         ftpc_getreply.c
 
 # FTP helpers
-CSRCS += ftpc/ftpc_utils.c \
-         ftpc/ftpc_socket.c
+CSRCS += ftpc_utils.c \
+         ftpc_socket.c
 
 DEPPATH += --dep-path ftpc
 VPATH += :ftpc

diff --git a/external/ftpd/Make.defs b/external/ftpd/Make.defs
index 808e377..c07f923 100644 (file)
--- a/external/ftpd/Make.defs
+++ b/external/ftpd/Make.defs
@@ -51,7 +51,7 @@
 ############################################################################
 
 ifeq ($(CONFIG_NET_LWIP),y)
-CSRCS          += ftpd/ftpd.c
+CSRCS          += ftpd.c
 endif
 
 DEPPATH += --dep-path ftpd

diff --git a/external/json/Make.defs b/external/json/Make.defs
index 4c3493c..7dfe2e9 100644 (file)
--- a/external/json/Make.defs
+++ b/external/json/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS += json/cJSON.c
+CSRCS += cJSON.c
 
 DEPPATH += --dep-path json
 VPATH += :json

diff --git a/external/mbedtls/Make.defs b/external/mbedtls/Make.defs
index 133f020..20aec10 100644 (file)
--- a/external/mbedtls/Make.defs
+++ b/external/mbedtls/Make.defs
@@ -51,33 +51,33 @@
 #
 ############################################################################
 
-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      \
-                      mbedtls/ccm.c           mbedtls/cipher.c        mbedtls/cipher_wrap.c   \
-                      mbedtls/cmac.c          mbedtls/ctr_drbg.c      mbedtls/des.c           mbedtls/dhm.c    \
-                      mbedtls/ecdh.c          mbedtls/ecdsa.c         mbedtls/ecjpake.c       mbedtls/ecp.c \
-                      mbedtls/ecp_curves.c    mbedtls/entropy.c       mbedtls/entropy_poll.c  \
-                      mbedtls/error.c         mbedtls/gcm.c           mbedtls/havege.c        \
-                      mbedtls/hmac_drbg.c     mbedtls/md.c            mbedtls/md2.c           \
-                      mbedtls/md4.c           mbedtls/md5.c           mbedtls/md_wrap.c       \
-                      mbedtls/memory_buffer_alloc.c           mbedtls/oid.c           \
-                      mbedtls/padlock.c       mbedtls/pem.c           mbedtls/pk.c            \
-                      mbedtls/pk_wrap.c       mbedtls/pkcs12.c        mbedtls/pkcs5.c         \
-                      mbedtls/pkparse.c       mbedtls/pkwrite.c       mbedtls/platform.c      \
-                      mbedtls/ripemd160.c     mbedtls/rsa.c           mbedtls/sha1.c          \
-                      mbedtls/sha256.c        mbedtls/sha512.c        mbedtls/threading.c     \
-                      mbedtls/timing.c        mbedtls/version.c                       \
-                      mbedtls/version_features.c              mbedtls/xtea.c
+SRC_CRYPTO_CSRCS =    aes.c           aesni.c         arc4.c          \
+                      asn1parse.c     asn1write.c     base64.c        \
+                      bignum.c        blowfish.c      camellia.c      \
+                      ccm.c           cipher.c        cipher_wrap.c   \
+                      cmac.c          ctr_drbg.c      des.c           dhm.c    \
+                      ecdh.c          ecdsa.c         ecjpake.c       ecp.c \
+                      ecp_curves.c    entropy.c       entropy_poll.c  \
+                      error.c         gcm.c           havege.c        \
+                      hmac_drbg.c     md.c            md2.c           \
+                      md4.c           md5.c           md_wrap.c       \
+                      memory_buffer_alloc.c           oid.c           \
+                      padlock.c       pem.c           pk.c            \
+                      pk_wrap.c       pkcs12.c        pkcs5.c         \
+                      pkparse.c       pkwrite.c       platform.c      \
+                      ripemd160.c     rsa.c           sha1.c          \
+                      sha256.c        sha512.c        threading.c     \
+                      timing.c        version.c                       \
+                      version_features.c              xtea.c
 
-SRC_X509_CSRCS =      mbedtls/certs.c         mbedtls/pkcs11.c        mbedtls/x509.c          \
-                      mbedtls/x509_create.c   mbedtls/x509_crl.c      mbedtls/x509_crt.c      \
-                      mbedtls/x509_csr.c      mbedtls/x509write_crt.c mbedtls/x509write_csr.c
+SRC_X509_CSRCS =      certs.c         pkcs11.c        x509.c          \
+                      x509_create.c   x509_crl.c      x509_crt.c      \
+                      x509_csr.c      x509write_crt.c x509write_csr.c
 
-SRC_TLS_CSRCS =       mbedtls/debug.c         mbedtls/net.c           mbedtls/ssl_cache.c     \
-                      mbedtls/ssl_ciphersuites.c              mbedtls/ssl_tls.c       \
-                      mbedtls/ssl_cli.c       mbedtls/ssl_cookie.c    mbedtls/ssl_srv.c       \
-                      mbedtls/ssl_ticket.c    mbedtls/easy_tls.c
+SRC_TLS_CSRCS =       debug.c         net.c           ssl_cache.c     \
+                      ssl_ciphersuites.c              ssl_tls.c       \
+                      ssl_cli.c       ssl_cookie.c    ssl_srv.c       \
+                      ssl_ticket.c    easy_tls.c
 
 ifeq ($(CONFIG_TLS_WITH_SSS),y)
 SRC_SEE_CSRCS += see_api.c     see_internal.c

diff --git a/external/mdns/Make.defs b/external/mdns/Make.defs
index bd867d7..5b0aff0 100644 (file)
--- a/external/mdns/Make.defs
+++ b/external/mdns/Make.defs
@@ -16,7 +16,7 @@
 #
 ###########################################################################
 
-CSRCS += mdns/mdns.c mdns/mdnsd.c
+CSRCS += mdns.c mdnsd.c
 
 DEPPATH += --dep-path mdns
 VPATH += :mdns

diff --git a/external/mosquitto/Make.defs b/external/mosquitto/Make.defs
index 1f42e38..424ce58 100644 (file)
--- a/external/mosquitto/Make.defs
+++ b/external/mosquitto/Make.defs
@@ -15,7 +15,7 @@
 # language governing permissions and limitations under the License.
 #
 ###########################################################################
-# external/dhcpd/Make.defs
+# external/mosquitto/Make.defs
 # Adds selected applications to external/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -50,25 +50,25 @@
 #
 ############################################################################
 
-include mosquitto/config.mk
+include config.mk
 
-CSRCS += mosquitto/tls_mosq.c
-CSRCS += mosquitto/net_mosq.c
-CSRCS += mosquitto/send_client_mosq.c
-CSRCS += mosquitto/messages_mosq.c
-CSRCS += mosquitto/util_mosq.c
-CSRCS += mosquitto/socks_mosq.c
-CSRCS += mosquitto/will_mosq.c
-CSRCS += mosquitto/mosquitto.c
-CSRCS += mosquitto/logging_mosq.c
-CSRCS += mosquitto/send_mosq.c
-CSRCS += mosquitto/read_handle_shared.c
-CSRCS += mosquitto/srv_mosq.c
-CSRCS += mosquitto/thread_mosq.c
-CSRCS += mosquitto/read_handle_client.c
-CSRCS += mosquitto/read_handle.c
-CSRCS += mosquitto/time_mosq.c
-CSRCS += mosquitto/memory_mosq.c
+CSRCS += tls_mosq.c
+CSRCS += net_mosq.c
+CSRCS += send_client_mosq.c
+CSRCS += messages_mosq.c
+CSRCS += util_mosq.c
+CSRCS += socks_mosq.c
+CSRCS += will_mosq.c
+CSRCS += mosquitto.c
+CSRCS += logging_mosq.c
+CSRCS += send_mosq.c
+CSRCS += read_handle_shared.c
+CSRCS += srv_mosq.c
+CSRCS += thread_mosq.c
+CSRCS += read_handle_client.c
+CSRCS += read_handle.c
+CSRCS += time_mosq.c
+CSRCS += memory_mosq.c
 
 DEPPATH += --dep-path mosquitto
 VPATH += :mosquitto

diff --git a/external/netutils/Make.defs b/external/netutils/Make.defs
index 94adfba..ed5fc4d 100644 (file)
--- a/external/netutils/Make.defs
+++ b/external/netutils/Make.defs
@@ -15,7 +15,7 @@
 # language governing permissions and limitations under the License.
 #
 ###########################################################################
-# external/netlib/Make.defs
+# external/netutils/Make.defs
 # Adds selected applications to external/ build
 #
 #   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -50,46 +50,46 @@
 #
 ############################################################################
 
-CSRCS += netutils/netlib.c
-CSRCS += netutils/netlib_parsehttpurl.c
-CSRCS += netutils/netlib_setifstatus.c \
-       netutils/netlib_getifstatus.c
+CSRCS += netlib.c
+CSRCS += netlib_parsehttpurl.c
+CSRCS += netlib_setifstatus.c \
+       netlib_getifstatus.c
 
 
 ifeq ($(CONFIG_NET_IPv4),y)
-CSRCS += netutils/netlib_setipv4addr.c \
-       netutils/netlib_getipv4addr.c \
-       netutils/netlib_getdripv4addr.c \
-       netutils/netlib_setdripv4addr.c \
-       netutils/netlib_setipv4netmask.c
+CSRCS += netlib_setipv4addr.c \
+       netlib_getipv4addr.c \
+       netlib_getdripv4addr.c \
+       netlib_setdripv4addr.c \
+       netlib_setipv4netmask.c
 endif
 
 ifeq ($(CONFIG_NET_IPv6),y)
-CSRCS += netutils/netlib_setipv6addr.c \
-       netutils/netlib_getipv6addr.c \
-       netutils/netlib_getdripv6addr.c \
-       netutils/netlib_setdripv6addr.c \
-       netutils/netlib_setipv6netmask.c \
-       netutils/netlib_prefix2ipv6netmask.c \
-       netutils/netlib_ipv6netmask2prefix.c
+CSRCS += netlib_setipv6addr.c \
+       netlib_getipv6addr.c \
+       netlib_getdripv6addr.c \
+       netlib_setdripv6addr.c \
+       netlib_setipv6netmask.c \
+       netlib_prefix2ipv6netmask.c \
+       netlib_ipv6netmask2prefix.c
 endif
 
 
 # No MAC address support for SLIP (Ethernet only)
 
 ifeq ($(CONFIG_NET_ETHERNET),y)
-CSRCS += netutils/netlib_setmacaddr.c \
-       netutils/netlib_getmacaddr.c
+CSRCS += netlib_setmacaddr.c \
+       netlib_getmacaddr.c
 endif
 
 # IGMP support
 
 ifeq ($(CONFIG_NET_IGMP),y)
 ifeq ($(CONFIG_NET_IPv4),y) # Not yet available for IPv6
-CSRCS += netutils/netlib_ipmsfilter.c
+CSRCS += netlib_ipmsfilter.c
 endif
 endif
 
-DEPPATH += --dep-path netlib
-VPATH += :netlib
+DEPPATH += --dep-path netutils
+VPATH += :netutils
 

diff --git a/external/ntpclient/Make.defs b/external/ntpclient/Make.defs
index c95049e..3249f75 100644 (file)
--- a/external/ntpclient/Make.defs
+++ b/external/ntpclient/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS += ntpclient/ntpclient.c
+CSRCS += ntpclient.c
 
 DEPPATH += --dep-path ntpclient
 VPATH += :ntpclient

diff --git a/external/smtp/Make.defs b/external/smtp/Make.defs
index 3233507..427ffb2 100644 (file)
--- a/external/smtp/Make.defs
+++ b/external/smtp/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS  += smtp/smtp.c
+CSRCS  += smtp.c
 
 DEPPATH += --dep-path smtp
 VPATH += :smtp

diff --git a/external/telnetd/Make.defs b/external/telnetd/Make.defs
index 661651a..ce1ffce 100644 (file)
--- a/external/telnetd/Make.defs
+++ b/external/telnetd/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS          += telnetd/telnetd_daemon.c
+CSRCS          += telnetd_daemon.c
 
 DEPPATH += --dep-path telnetd
 VPATH += :telnetd

diff --git a/external/tftpc/Make.defs b/external/tftpc/Make.defs
index e005c59..2f84f13 100644 (file)
--- a/external/tftpc/Make.defs
+++ b/external/tftpc/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS += tftpc/tftpc_get.c tftpc/tftpc_put.c tftpc/tftpc_packets.c
+CSRCS += tftpc_get.c tftpc_put.c tftpc_packets.c
 
 DEPPATH += --dep-path tftpc
 VPATH += :tftpc

diff --git a/external/webclient/Make.defs b/external/webclient/Make.defs
index 5201594..7151a3f 100644 (file)
--- a/external/webclient/Make.defs
+++ b/external/webclient/Make.defs
@@ -50,7 +50,7 @@
 #
 ############################################################################
 
-CSRCS  += webclient/webclient.c
+CSRCS  += webclient.c
 
 DEPPATH += --dep-path webclient
 VPATH += :webclient

diff --git a/external/webserver/Make.defs b/external/webserver/Make.defs
index 8b21607..e5f70ed 100644 (file)
--- a/external/webserver/Make.defs
+++ b/external/webserver/Make.defs
@@ -50,16 +50,16 @@
 #
 ############################################################################
 
-CSRCS  += webserver/http.c
-CSRCS   += webserver/http_server.c
-CSRCS   += webserver/http_client.c
+CSRCS  += http.c
+CSRCS   += http_server.c
+CSRCS   += http_client.c
 ifeq ($(CONFIG_NET_SECURITY_TLS),y)
-CSRCS   += webserver/http_client_tls.c
-CSRCS   += webserver/http_server_tls.c
+CSRCS   += http_client_tls.c
+CSRCS   += http_server_tls.c
 endif
-CSRCS   += webserver/http_string_util.c
-CSRCS   += webserver/http_keyvalue_list.c
-CSRCS   += webserver/http_query.c
+CSRCS   += http_string_util.c
+CSRCS   += http_keyvalue_list.c
+CSRCS   += http_query.c
 
 DEPPATH += --dep-path webserver
 VPATH += :webserver

diff --git a/external/websocket/Make.defs b/external/websocket/Make.defs
index d5ead98..29c18d8 100644 (file)
--- a/external/websocket/Make.defs
+++ b/external/websocket/Make.defs
@@ -16,12 +16,11 @@
 #
 ###########################################################################
 
-CSRCS += websocket/websocket.c
-CSRCS += websocket/wslay/wslay_net.c \
-         websocket/wslay/wslay_queue.c \
-         websocket/wslay/wslay_frame.c \
-         websocket/wslay/wslay_event.c
-
-DEPPATH += --dep-path websocket
-VPATH += :websocket
+CSRCS += websocket.c
+CSRCS += wslay_net.c \
+         wslay_queue.c \
+         wslay_frame.c \
+         wslay_event.c
 
+DEPPATH += --dep-path websocket --dep-path websocket/wslay
+VPATH += websocket websocket/wslay

diff --git a/external/xmlrpc/Make.defs b/external/xmlrpc/Make.defs
index a7fb454..7ed249b 100644 (file)
--- a/external/xmlrpc/Make.defs
+++ b/external/xmlrpc/Make.defs
@@ -51,8 +51,8 @@
 #
 ############################################################################
 
-CSRCS += xmlrpc/xmlparser.c \
-         xmlrpc/response.c
+CSRCS += xmlparser.c \
+         response.c
 
 DEPPATH += --dep-path xmlrpc
 VPATH += :xmlrpc