From 9cf069f88ba43931c46b245f567b0f8371a6067c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Oct 2014 15:07:44 -0400 Subject: [PATCH] curl: Move sources back into upstream layout Update our build files as needed to compensate. --- Utilities/cm_curl.h | 2 +- Utilities/cmcurl/CMakeLists.txt | 138 +++++++++--------- Utilities/cmcurl/{ => include}/ca-bundle.h | 0 Utilities/cmcurl/{ => include}/curl/curl.h | 0 Utilities/cmcurl/{ => include}/curl/curlver.h | 0 Utilities/cmcurl/{ => include}/curl/easy.h | 0 Utilities/cmcurl/{ => include}/curl/mprintf.h | 0 Utilities/cmcurl/{ => include}/curl/multi.h | 0 .../cmcurl/{ => include}/curl/stdcheaders.h | 0 Utilities/cmcurl/{ => include}/curl/types.h | 0 Utilities/cmcurl/{ => lib}/amigaos.c | 0 Utilities/cmcurl/{ => lib}/amigaos.h | 0 Utilities/cmcurl/{ => lib}/arpa_telnet.h | 0 Utilities/cmcurl/{ => lib}/base64.c | 0 Utilities/cmcurl/{ => lib}/base64.h | 0 Utilities/cmcurl/{ => lib}/connect.c | 0 Utilities/cmcurl/{ => lib}/connect.h | 0 Utilities/cmcurl/{ => lib}/content_encoding.c | 0 Utilities/cmcurl/{ => lib}/content_encoding.h | 0 Utilities/cmcurl/{ => lib}/cookie.c | 0 Utilities/cmcurl/{ => lib}/cookie.h | 0 Utilities/cmcurl/{ => lib}/curlx.h | 0 Utilities/cmcurl/{ => lib}/dict.c | 0 Utilities/cmcurl/{ => lib}/dict.h | 0 Utilities/cmcurl/{ => lib}/easy.c | 0 Utilities/cmcurl/{ => lib}/easyif.h | 0 Utilities/cmcurl/{ => lib}/escape.c | 0 Utilities/cmcurl/{ => lib}/escape.h | 0 Utilities/cmcurl/{ => lib}/file.c | 0 Utilities/cmcurl/{ => lib}/file.h | 0 Utilities/cmcurl/{ => lib}/formdata.c | 0 Utilities/cmcurl/{ => lib}/formdata.h | 0 Utilities/cmcurl/{ => lib}/ftp.c | 0 Utilities/cmcurl/{ => lib}/ftp.h | 0 Utilities/cmcurl/{ => lib}/getenv.c | 0 Utilities/cmcurl/{ => lib}/getinfo.c | 0 Utilities/cmcurl/{ => lib}/getinfo.h | 0 Utilities/cmcurl/{ => lib}/gtls.c | 0 Utilities/cmcurl/{ => lib}/gtls.h | 0 Utilities/cmcurl/{ => lib}/hash.c | 0 Utilities/cmcurl/{ => lib}/hash.h | 0 Utilities/cmcurl/{ => lib}/hostares.c | 0 Utilities/cmcurl/{ => lib}/hostasyn.c | 0 Utilities/cmcurl/{ => lib}/hostip.c | 0 Utilities/cmcurl/{ => lib}/hostip.h | 0 Utilities/cmcurl/{ => lib}/hostip4.c | 0 Utilities/cmcurl/{ => lib}/hostip6.c | 0 Utilities/cmcurl/{ => lib}/hostsyn.c | 0 Utilities/cmcurl/{ => lib}/hostthre.c | 0 Utilities/cmcurl/{ => lib}/http.c | 0 Utilities/cmcurl/{ => lib}/http.h | 0 Utilities/cmcurl/{ => lib}/http_chunks.c | 0 Utilities/cmcurl/{ => lib}/http_chunks.h | 0 Utilities/cmcurl/{ => lib}/http_digest.c | 0 Utilities/cmcurl/{ => lib}/http_digest.h | 0 Utilities/cmcurl/{ => lib}/http_negotiate.c | 0 Utilities/cmcurl/{ => lib}/http_negotiate.h | 0 Utilities/cmcurl/{ => lib}/http_ntlm.c | 0 Utilities/cmcurl/{ => lib}/http_ntlm.h | 0 Utilities/cmcurl/{ => lib}/if2ip.c | 0 Utilities/cmcurl/{ => lib}/if2ip.h | 0 Utilities/cmcurl/{ => lib}/inet_ntoa_r.h | 0 Utilities/cmcurl/{ => lib}/inet_ntop.c | 0 Utilities/cmcurl/{ => lib}/inet_ntop.h | 0 Utilities/cmcurl/{ => lib}/inet_pton.c | 0 Utilities/cmcurl/{ => lib}/inet_pton.h | 0 Utilities/cmcurl/{ => lib}/krb4.c | 0 Utilities/cmcurl/{ => lib}/krb4.h | 0 Utilities/cmcurl/{ => lib}/ldap.c | 0 Utilities/cmcurl/{ => lib}/ldap.h | 0 Utilities/cmcurl/{ => lib}/llist.c | 0 Utilities/cmcurl/{ => lib}/llist.h | 0 Utilities/cmcurl/{ => lib}/md5.c | 0 Utilities/cmcurl/{ => lib}/md5.h | 0 Utilities/cmcurl/{ => lib}/memdebug.c | 0 Utilities/cmcurl/{ => lib}/memdebug.h | 0 Utilities/cmcurl/{ => lib}/memory.h | 0 Utilities/cmcurl/{ => lib}/mprintf.c | 0 Utilities/cmcurl/{ => lib}/multi.c | 0 Utilities/cmcurl/{ => lib}/multiif.h | 0 Utilities/cmcurl/{ => lib}/netrc.c | 0 Utilities/cmcurl/{ => lib}/netrc.h | 0 Utilities/cmcurl/{ => lib}/nwlib.c | 0 Utilities/cmcurl/{ => lib}/parsedate.c | 0 Utilities/cmcurl/{ => lib}/parsedate.h | 0 Utilities/cmcurl/{ => lib}/progress.c | 0 Utilities/cmcurl/{ => lib}/progress.h | 0 Utilities/cmcurl/{ => lib}/security.c | 0 Utilities/cmcurl/{ => lib}/select.c | 0 Utilities/cmcurl/{ => lib}/select.h | 0 Utilities/cmcurl/{ => lib}/sendf.c | 0 Utilities/cmcurl/{ => lib}/sendf.h | 0 Utilities/cmcurl/{ => lib}/setup.h | 0 Utilities/cmcurl/{ => lib}/setup_once.h | 0 Utilities/cmcurl/{ => lib}/share.c | 0 Utilities/cmcurl/{ => lib}/share.h | 0 Utilities/cmcurl/{ => lib}/sockaddr.h | 0 Utilities/cmcurl/{ => lib}/socks.c | 0 Utilities/cmcurl/{ => lib}/socks.h | 0 Utilities/cmcurl/{ => lib}/speedcheck.c | 0 Utilities/cmcurl/{ => lib}/speedcheck.h | 0 Utilities/cmcurl/{ => lib}/splay.c | 0 Utilities/cmcurl/{ => lib}/splay.h | 0 Utilities/cmcurl/{ => lib}/ssh.c | 0 Utilities/cmcurl/{ => lib}/ssh.h | 0 Utilities/cmcurl/{ => lib}/sslgen.c | 0 Utilities/cmcurl/{ => lib}/sslgen.h | 0 Utilities/cmcurl/{ => lib}/ssluse.c | 0 Utilities/cmcurl/{ => lib}/ssluse.h | 0 Utilities/cmcurl/{ => lib}/strdup.c | 0 Utilities/cmcurl/{ => lib}/strdup.h | 0 Utilities/cmcurl/{ => lib}/strequal.c | 0 Utilities/cmcurl/{ => lib}/strequal.h | 0 Utilities/cmcurl/{ => lib}/strerror.c | 0 Utilities/cmcurl/{ => lib}/strerror.h | 0 Utilities/cmcurl/{ => lib}/strtok.c | 0 Utilities/cmcurl/{ => lib}/strtok.h | 0 Utilities/cmcurl/{ => lib}/strtoofft.c | 0 Utilities/cmcurl/{ => lib}/strtoofft.h | 0 Utilities/cmcurl/{ => lib}/telnet.c | 0 Utilities/cmcurl/{ => lib}/telnet.h | 0 Utilities/cmcurl/{ => lib}/tftp.c | 0 Utilities/cmcurl/{ => lib}/tftp.h | 0 Utilities/cmcurl/{ => lib}/timeval.c | 0 Utilities/cmcurl/{ => lib}/timeval.h | 0 Utilities/cmcurl/{ => lib}/transfer.c | 0 Utilities/cmcurl/{ => lib}/transfer.h | 0 Utilities/cmcurl/{ => lib}/url.c | 0 Utilities/cmcurl/{ => lib}/url.h | 0 Utilities/cmcurl/{ => lib}/urldata.h | 0 Utilities/cmcurl/{ => lib}/version.c | 0 131 files changed, 70 insertions(+), 70 deletions(-) rename Utilities/cmcurl/{ => include}/ca-bundle.h (100%) rename Utilities/cmcurl/{ => include}/curl/curl.h (100%) rename Utilities/cmcurl/{ => include}/curl/curlver.h (100%) rename Utilities/cmcurl/{ => include}/curl/easy.h (100%) rename Utilities/cmcurl/{ => include}/curl/mprintf.h (100%) rename Utilities/cmcurl/{ => include}/curl/multi.h (100%) rename Utilities/cmcurl/{ => include}/curl/stdcheaders.h (100%) rename Utilities/cmcurl/{ => include}/curl/types.h (100%) rename Utilities/cmcurl/{ => lib}/amigaos.c (100%) rename Utilities/cmcurl/{ => lib}/amigaos.h (100%) rename Utilities/cmcurl/{ => lib}/arpa_telnet.h (100%) rename Utilities/cmcurl/{ => lib}/base64.c (100%) rename Utilities/cmcurl/{ => lib}/base64.h (100%) rename Utilities/cmcurl/{ => lib}/connect.c (100%) rename Utilities/cmcurl/{ => lib}/connect.h (100%) rename Utilities/cmcurl/{ => lib}/content_encoding.c (100%) rename Utilities/cmcurl/{ => lib}/content_encoding.h (100%) rename Utilities/cmcurl/{ => lib}/cookie.c (100%) rename Utilities/cmcurl/{ => lib}/cookie.h (100%) rename Utilities/cmcurl/{ => lib}/curlx.h (100%) rename Utilities/cmcurl/{ => lib}/dict.c (100%) rename Utilities/cmcurl/{ => lib}/dict.h (100%) rename Utilities/cmcurl/{ => lib}/easy.c (100%) rename Utilities/cmcurl/{ => lib}/easyif.h (100%) rename Utilities/cmcurl/{ => lib}/escape.c (100%) rename Utilities/cmcurl/{ => lib}/escape.h (100%) rename Utilities/cmcurl/{ => lib}/file.c (100%) rename Utilities/cmcurl/{ => lib}/file.h (100%) rename Utilities/cmcurl/{ => lib}/formdata.c (100%) rename Utilities/cmcurl/{ => lib}/formdata.h (100%) rename Utilities/cmcurl/{ => lib}/ftp.c (100%) rename Utilities/cmcurl/{ => lib}/ftp.h (100%) rename Utilities/cmcurl/{ => lib}/getenv.c (100%) rename Utilities/cmcurl/{ => lib}/getinfo.c (100%) rename Utilities/cmcurl/{ => lib}/getinfo.h (100%) rename Utilities/cmcurl/{ => lib}/gtls.c (100%) rename Utilities/cmcurl/{ => lib}/gtls.h (100%) rename Utilities/cmcurl/{ => lib}/hash.c (100%) rename Utilities/cmcurl/{ => lib}/hash.h (100%) rename Utilities/cmcurl/{ => lib}/hostares.c (100%) rename Utilities/cmcurl/{ => lib}/hostasyn.c (100%) rename Utilities/cmcurl/{ => lib}/hostip.c (100%) rename Utilities/cmcurl/{ => lib}/hostip.h (100%) rename Utilities/cmcurl/{ => lib}/hostip4.c (100%) rename Utilities/cmcurl/{ => lib}/hostip6.c (100%) rename Utilities/cmcurl/{ => lib}/hostsyn.c (100%) rename Utilities/cmcurl/{ => lib}/hostthre.c (100%) rename Utilities/cmcurl/{ => lib}/http.c (100%) rename Utilities/cmcurl/{ => lib}/http.h (100%) rename Utilities/cmcurl/{ => lib}/http_chunks.c (100%) rename Utilities/cmcurl/{ => lib}/http_chunks.h (100%) rename Utilities/cmcurl/{ => lib}/http_digest.c (100%) rename Utilities/cmcurl/{ => lib}/http_digest.h (100%) rename Utilities/cmcurl/{ => lib}/http_negotiate.c (100%) rename Utilities/cmcurl/{ => lib}/http_negotiate.h (100%) rename Utilities/cmcurl/{ => lib}/http_ntlm.c (100%) rename Utilities/cmcurl/{ => lib}/http_ntlm.h (100%) rename Utilities/cmcurl/{ => lib}/if2ip.c (100%) rename Utilities/cmcurl/{ => lib}/if2ip.h (100%) rename Utilities/cmcurl/{ => lib}/inet_ntoa_r.h (100%) rename Utilities/cmcurl/{ => lib}/inet_ntop.c (100%) rename Utilities/cmcurl/{ => lib}/inet_ntop.h (100%) rename Utilities/cmcurl/{ => lib}/inet_pton.c (100%) rename Utilities/cmcurl/{ => lib}/inet_pton.h (100%) rename Utilities/cmcurl/{ => lib}/krb4.c (100%) rename Utilities/cmcurl/{ => lib}/krb4.h (100%) rename Utilities/cmcurl/{ => lib}/ldap.c (100%) rename Utilities/cmcurl/{ => lib}/ldap.h (100%) rename Utilities/cmcurl/{ => lib}/llist.c (100%) rename Utilities/cmcurl/{ => lib}/llist.h (100%) rename Utilities/cmcurl/{ => lib}/md5.c (100%) rename Utilities/cmcurl/{ => lib}/md5.h (100%) rename Utilities/cmcurl/{ => lib}/memdebug.c (100%) rename Utilities/cmcurl/{ => lib}/memdebug.h (100%) rename Utilities/cmcurl/{ => lib}/memory.h (100%) rename Utilities/cmcurl/{ => lib}/mprintf.c (100%) rename Utilities/cmcurl/{ => lib}/multi.c (100%) rename Utilities/cmcurl/{ => lib}/multiif.h (100%) rename Utilities/cmcurl/{ => lib}/netrc.c (100%) rename Utilities/cmcurl/{ => lib}/netrc.h (100%) rename Utilities/cmcurl/{ => lib}/nwlib.c (100%) rename Utilities/cmcurl/{ => lib}/parsedate.c (100%) rename Utilities/cmcurl/{ => lib}/parsedate.h (100%) rename Utilities/cmcurl/{ => lib}/progress.c (100%) rename Utilities/cmcurl/{ => lib}/progress.h (100%) rename Utilities/cmcurl/{ => lib}/security.c (100%) rename Utilities/cmcurl/{ => lib}/select.c (100%) rename Utilities/cmcurl/{ => lib}/select.h (100%) rename Utilities/cmcurl/{ => lib}/sendf.c (100%) rename Utilities/cmcurl/{ => lib}/sendf.h (100%) rename Utilities/cmcurl/{ => lib}/setup.h (100%) rename Utilities/cmcurl/{ => lib}/setup_once.h (100%) rename Utilities/cmcurl/{ => lib}/share.c (100%) rename Utilities/cmcurl/{ => lib}/share.h (100%) rename Utilities/cmcurl/{ => lib}/sockaddr.h (100%) rename Utilities/cmcurl/{ => lib}/socks.c (100%) rename Utilities/cmcurl/{ => lib}/socks.h (100%) rename Utilities/cmcurl/{ => lib}/speedcheck.c (100%) rename Utilities/cmcurl/{ => lib}/speedcheck.h (100%) rename Utilities/cmcurl/{ => lib}/splay.c (100%) rename Utilities/cmcurl/{ => lib}/splay.h (100%) rename Utilities/cmcurl/{ => lib}/ssh.c (100%) rename Utilities/cmcurl/{ => lib}/ssh.h (100%) rename Utilities/cmcurl/{ => lib}/sslgen.c (100%) rename Utilities/cmcurl/{ => lib}/sslgen.h (100%) rename Utilities/cmcurl/{ => lib}/ssluse.c (100%) rename Utilities/cmcurl/{ => lib}/ssluse.h (100%) rename Utilities/cmcurl/{ => lib}/strdup.c (100%) rename Utilities/cmcurl/{ => lib}/strdup.h (100%) rename Utilities/cmcurl/{ => lib}/strequal.c (100%) rename Utilities/cmcurl/{ => lib}/strequal.h (100%) rename Utilities/cmcurl/{ => lib}/strerror.c (100%) rename Utilities/cmcurl/{ => lib}/strerror.h (100%) rename Utilities/cmcurl/{ => lib}/strtok.c (100%) rename Utilities/cmcurl/{ => lib}/strtok.h (100%) rename Utilities/cmcurl/{ => lib}/strtoofft.c (100%) rename Utilities/cmcurl/{ => lib}/strtoofft.h (100%) rename Utilities/cmcurl/{ => lib}/telnet.c (100%) rename Utilities/cmcurl/{ => lib}/telnet.h (100%) rename Utilities/cmcurl/{ => lib}/tftp.c (100%) rename Utilities/cmcurl/{ => lib}/tftp.h (100%) rename Utilities/cmcurl/{ => lib}/timeval.c (100%) rename Utilities/cmcurl/{ => lib}/timeval.h (100%) rename Utilities/cmcurl/{ => lib}/transfer.c (100%) rename Utilities/cmcurl/{ => lib}/transfer.h (100%) rename Utilities/cmcurl/{ => lib}/url.c (100%) rename Utilities/cmcurl/{ => lib}/url.h (100%) rename Utilities/cmcurl/{ => lib}/urldata.h (100%) rename Utilities/cmcurl/{ => lib}/version.c (100%) diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h index 43944a3f4..a3b049bed 100644 --- a/Utilities/cm_curl.h +++ b/Utilities/cm_curl.h @@ -17,7 +17,7 @@ #ifdef CMAKE_USE_SYSTEM_CURL # include #else -# include +# include #endif #endif diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 97fd2ffce..a48de2d86 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -34,75 +34,75 @@ INCLUDE (CheckSymbolExists) INCLUDE (CheckTypeSize) SET(libCurl_SRCS - # amigaos.c - does not build on AmigaOS - base64.c - connect.c - content_encoding.c - cookie.c - dict.c - easy.c - escape.c - file.c - formdata.c - ftp.c - getenv.c - getinfo.c - gtls.c - hash.c - hostares.c - hostasyn.c - hostip4.c - hostip6.c - hostip.c - hostsyn.c - hostthre.c - http.c - http_chunks.c - http_digest.c - http_negotiate.c - http_ntlm.c - if2ip.c - inet_ntop.c - inet_pton.c - krb4.c - ldap.c - llist.c - md5.c -# memdebug.c -not used - mprintf.c - multi.c - netrc.c - # nwlib.c - Not used - parsedate.c - progress.c - security.c - select.c - sendf.c - share.c - socks.c - speedcheck.c - splay.c - ssh.c - sslgen.c - ssluse.c - strdup.c - strequal.c - strerror.c - # strtok.c - specify later - # strtoofft.c - specify later - telnet.c - tftp.c - timeval.c - transfer.c - url.c - version.c + # lib/amigaos.c - does not build on AmigaOS + lib/base64.c + lib/connect.c + lib/content_encoding.c + lib/cookie.c + lib/dict.c + lib/easy.c + lib/escape.c + lib/file.c + lib/formdata.c + lib/ftp.c + lib/getenv.c + lib/getinfo.c + lib/gtls.c + lib/hash.c + lib/hostares.c + lib/hostasyn.c + lib/hostip4.c + lib/hostip6.c + lib/hostip.c + lib/hostsyn.c + lib/hostthre.c + lib/http.c + lib/http_chunks.c + lib/http_digest.c + lib/http_negotiate.c + lib/http_ntlm.c + lib/if2ip.c + lib/inet_ntop.c + lib/inet_pton.c + lib/krb4.c + lib/ldap.c + lib/llist.c + lib/md5.c +# lib/memdebug.c -not used + lib/mprintf.c + lib/multi.c + lib/netrc.c + # lib/nwlib.c - Not used + lib/parsedate.c + lib/progress.c + lib/security.c + lib/select.c + lib/sendf.c + lib/share.c + lib/socks.c + lib/speedcheck.c + lib/splay.c + lib/ssh.c + lib/sslgen.c + lib/ssluse.c + lib/strdup.c + lib/strequal.c + lib/strerror.c + # lib/strtok.c - specify later + # lib/strtoofft.c - specify later + lib/telnet.c + lib/tftp.c + lib/timeval.c + lib/transfer.c + lib/url.c + lib/version.c ) SET(CURL_DISABLE_LDAP 1) IF(NOT CURL_DISABLE_LDAP) SET(libCurl_SRCS ${libCurl_SRCS} - ldap.c + lib/ldap.c ) ENDIF(NOT CURL_DISABLE_LDAP) @@ -110,8 +110,8 @@ ENDIF(NOT CURL_DISABLE_LDAP) #OPTION(CURL_KRB4 "Use Kerberos 4" OFF) IF(CURL_KRB4) SET(libCurl_SRCS ${libCurl_SRCS} - krb4.c - security.c + lib/krb4.c + lib/security.c ) ENDIF(CURL_KRB4) @@ -119,7 +119,7 @@ ENDIF(CURL_KRB4) MARK_AS_ADVANCED(CURL_MALLOC_DEBUG) IF(CURL_MALLOC_DEBUG) SET(libCurl_SRCS ${libCurl_SRCS} - memdebug.c + lib/memdebug.c ) ENDIF(CURL_MALLOC_DEBUG) @@ -169,7 +169,7 @@ ENDIF(NOT CURL_SPECIAL_LIBZ) # Include the local directories before any others so that we do not end up # including system curl's include directory first by mistake. -INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF) @@ -472,14 +472,14 @@ CHECK_SYMBOL_EXISTS(setrlimit "${CURL_INCLUDES}" HAVE_SETRLIMIT) # only build compat strtok if we need to IF (NOT HAVE_STRTOK_R) SET(libCurl_SRCS ${libCurl_SRCS} - strtok.c + lib/strtok.c ) ENDIF (NOT HAVE_STRTOK_R) # only build compat strtoofft if we need to IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) SET(libCurl_SRCS ${libCurl_SRCS} - strtoofft.c + lib/strtoofft.c ) ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) diff --git a/Utilities/cmcurl/ca-bundle.h b/Utilities/cmcurl/include/ca-bundle.h similarity index 100% rename from Utilities/cmcurl/ca-bundle.h rename to Utilities/cmcurl/include/ca-bundle.h diff --git a/Utilities/cmcurl/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h similarity index 100% rename from Utilities/cmcurl/curl/curl.h rename to Utilities/cmcurl/include/curl/curl.h diff --git a/Utilities/cmcurl/curl/curlver.h b/Utilities/cmcurl/include/curl/curlver.h similarity index 100% rename from Utilities/cmcurl/curl/curlver.h rename to Utilities/cmcurl/include/curl/curlver.h diff --git a/Utilities/cmcurl/curl/easy.h b/Utilities/cmcurl/include/curl/easy.h similarity index 100% rename from Utilities/cmcurl/curl/easy.h rename to Utilities/cmcurl/include/curl/easy.h diff --git a/Utilities/cmcurl/curl/mprintf.h b/Utilities/cmcurl/include/curl/mprintf.h similarity index 100% rename from Utilities/cmcurl/curl/mprintf.h rename to Utilities/cmcurl/include/curl/mprintf.h diff --git a/Utilities/cmcurl/curl/multi.h b/Utilities/cmcurl/include/curl/multi.h similarity index 100% rename from Utilities/cmcurl/curl/multi.h rename to Utilities/cmcurl/include/curl/multi.h diff --git a/Utilities/cmcurl/curl/stdcheaders.h b/Utilities/cmcurl/include/curl/stdcheaders.h similarity index 100% rename from Utilities/cmcurl/curl/stdcheaders.h rename to Utilities/cmcurl/include/curl/stdcheaders.h diff --git a/Utilities/cmcurl/curl/types.h b/Utilities/cmcurl/include/curl/types.h similarity index 100% rename from Utilities/cmcurl/curl/types.h rename to Utilities/cmcurl/include/curl/types.h diff --git a/Utilities/cmcurl/amigaos.c b/Utilities/cmcurl/lib/amigaos.c similarity index 100% rename from Utilities/cmcurl/amigaos.c rename to Utilities/cmcurl/lib/amigaos.c diff --git a/Utilities/cmcurl/amigaos.h b/Utilities/cmcurl/lib/amigaos.h similarity index 100% rename from Utilities/cmcurl/amigaos.h rename to Utilities/cmcurl/lib/amigaos.h diff --git a/Utilities/cmcurl/arpa_telnet.h b/Utilities/cmcurl/lib/arpa_telnet.h similarity index 100% rename from Utilities/cmcurl/arpa_telnet.h rename to Utilities/cmcurl/lib/arpa_telnet.h diff --git a/Utilities/cmcurl/base64.c b/Utilities/cmcurl/lib/base64.c similarity index 100% rename from Utilities/cmcurl/base64.c rename to Utilities/cmcurl/lib/base64.c diff --git a/Utilities/cmcurl/base64.h b/Utilities/cmcurl/lib/base64.h similarity index 100% rename from Utilities/cmcurl/base64.h rename to Utilities/cmcurl/lib/base64.h diff --git a/Utilities/cmcurl/connect.c b/Utilities/cmcurl/lib/connect.c similarity index 100% rename from Utilities/cmcurl/connect.c rename to Utilities/cmcurl/lib/connect.c diff --git a/Utilities/cmcurl/connect.h b/Utilities/cmcurl/lib/connect.h similarity index 100% rename from Utilities/cmcurl/connect.h rename to Utilities/cmcurl/lib/connect.h diff --git a/Utilities/cmcurl/content_encoding.c b/Utilities/cmcurl/lib/content_encoding.c similarity index 100% rename from Utilities/cmcurl/content_encoding.c rename to Utilities/cmcurl/lib/content_encoding.c diff --git a/Utilities/cmcurl/content_encoding.h b/Utilities/cmcurl/lib/content_encoding.h similarity index 100% rename from Utilities/cmcurl/content_encoding.h rename to Utilities/cmcurl/lib/content_encoding.h diff --git a/Utilities/cmcurl/cookie.c b/Utilities/cmcurl/lib/cookie.c similarity index 100% rename from Utilities/cmcurl/cookie.c rename to Utilities/cmcurl/lib/cookie.c diff --git a/Utilities/cmcurl/cookie.h b/Utilities/cmcurl/lib/cookie.h similarity index 100% rename from Utilities/cmcurl/cookie.h rename to Utilities/cmcurl/lib/cookie.h diff --git a/Utilities/cmcurl/curlx.h b/Utilities/cmcurl/lib/curlx.h similarity index 100% rename from Utilities/cmcurl/curlx.h rename to Utilities/cmcurl/lib/curlx.h diff --git a/Utilities/cmcurl/dict.c b/Utilities/cmcurl/lib/dict.c similarity index 100% rename from Utilities/cmcurl/dict.c rename to Utilities/cmcurl/lib/dict.c diff --git a/Utilities/cmcurl/dict.h b/Utilities/cmcurl/lib/dict.h similarity index 100% rename from Utilities/cmcurl/dict.h rename to Utilities/cmcurl/lib/dict.h diff --git a/Utilities/cmcurl/easy.c b/Utilities/cmcurl/lib/easy.c similarity index 100% rename from Utilities/cmcurl/easy.c rename to Utilities/cmcurl/lib/easy.c diff --git a/Utilities/cmcurl/easyif.h b/Utilities/cmcurl/lib/easyif.h similarity index 100% rename from Utilities/cmcurl/easyif.h rename to Utilities/cmcurl/lib/easyif.h diff --git a/Utilities/cmcurl/escape.c b/Utilities/cmcurl/lib/escape.c similarity index 100% rename from Utilities/cmcurl/escape.c rename to Utilities/cmcurl/lib/escape.c diff --git a/Utilities/cmcurl/escape.h b/Utilities/cmcurl/lib/escape.h similarity index 100% rename from Utilities/cmcurl/escape.h rename to Utilities/cmcurl/lib/escape.h diff --git a/Utilities/cmcurl/file.c b/Utilities/cmcurl/lib/file.c similarity index 100% rename from Utilities/cmcurl/file.c rename to Utilities/cmcurl/lib/file.c diff --git a/Utilities/cmcurl/file.h b/Utilities/cmcurl/lib/file.h similarity index 100% rename from Utilities/cmcurl/file.h rename to Utilities/cmcurl/lib/file.h diff --git a/Utilities/cmcurl/formdata.c b/Utilities/cmcurl/lib/formdata.c similarity index 100% rename from Utilities/cmcurl/formdata.c rename to Utilities/cmcurl/lib/formdata.c diff --git a/Utilities/cmcurl/formdata.h b/Utilities/cmcurl/lib/formdata.h similarity index 100% rename from Utilities/cmcurl/formdata.h rename to Utilities/cmcurl/lib/formdata.h diff --git a/Utilities/cmcurl/ftp.c b/Utilities/cmcurl/lib/ftp.c similarity index 100% rename from Utilities/cmcurl/ftp.c rename to Utilities/cmcurl/lib/ftp.c diff --git a/Utilities/cmcurl/ftp.h b/Utilities/cmcurl/lib/ftp.h similarity index 100% rename from Utilities/cmcurl/ftp.h rename to Utilities/cmcurl/lib/ftp.h diff --git a/Utilities/cmcurl/getenv.c b/Utilities/cmcurl/lib/getenv.c similarity index 100% rename from Utilities/cmcurl/getenv.c rename to Utilities/cmcurl/lib/getenv.c diff --git a/Utilities/cmcurl/getinfo.c b/Utilities/cmcurl/lib/getinfo.c similarity index 100% rename from Utilities/cmcurl/getinfo.c rename to Utilities/cmcurl/lib/getinfo.c diff --git a/Utilities/cmcurl/getinfo.h b/Utilities/cmcurl/lib/getinfo.h similarity index 100% rename from Utilities/cmcurl/getinfo.h rename to Utilities/cmcurl/lib/getinfo.h diff --git a/Utilities/cmcurl/gtls.c b/Utilities/cmcurl/lib/gtls.c similarity index 100% rename from Utilities/cmcurl/gtls.c rename to Utilities/cmcurl/lib/gtls.c diff --git a/Utilities/cmcurl/gtls.h b/Utilities/cmcurl/lib/gtls.h similarity index 100% rename from Utilities/cmcurl/gtls.h rename to Utilities/cmcurl/lib/gtls.h diff --git a/Utilities/cmcurl/hash.c b/Utilities/cmcurl/lib/hash.c similarity index 100% rename from Utilities/cmcurl/hash.c rename to Utilities/cmcurl/lib/hash.c diff --git a/Utilities/cmcurl/hash.h b/Utilities/cmcurl/lib/hash.h similarity index 100% rename from Utilities/cmcurl/hash.h rename to Utilities/cmcurl/lib/hash.h diff --git a/Utilities/cmcurl/hostares.c b/Utilities/cmcurl/lib/hostares.c similarity index 100% rename from Utilities/cmcurl/hostares.c rename to Utilities/cmcurl/lib/hostares.c diff --git a/Utilities/cmcurl/hostasyn.c b/Utilities/cmcurl/lib/hostasyn.c similarity index 100% rename from Utilities/cmcurl/hostasyn.c rename to Utilities/cmcurl/lib/hostasyn.c diff --git a/Utilities/cmcurl/hostip.c b/Utilities/cmcurl/lib/hostip.c similarity index 100% rename from Utilities/cmcurl/hostip.c rename to Utilities/cmcurl/lib/hostip.c diff --git a/Utilities/cmcurl/hostip.h b/Utilities/cmcurl/lib/hostip.h similarity index 100% rename from Utilities/cmcurl/hostip.h rename to Utilities/cmcurl/lib/hostip.h diff --git a/Utilities/cmcurl/hostip4.c b/Utilities/cmcurl/lib/hostip4.c similarity index 100% rename from Utilities/cmcurl/hostip4.c rename to Utilities/cmcurl/lib/hostip4.c diff --git a/Utilities/cmcurl/hostip6.c b/Utilities/cmcurl/lib/hostip6.c similarity index 100% rename from Utilities/cmcurl/hostip6.c rename to Utilities/cmcurl/lib/hostip6.c diff --git a/Utilities/cmcurl/hostsyn.c b/Utilities/cmcurl/lib/hostsyn.c similarity index 100% rename from Utilities/cmcurl/hostsyn.c rename to Utilities/cmcurl/lib/hostsyn.c diff --git a/Utilities/cmcurl/hostthre.c b/Utilities/cmcurl/lib/hostthre.c similarity index 100% rename from Utilities/cmcurl/hostthre.c rename to Utilities/cmcurl/lib/hostthre.c diff --git a/Utilities/cmcurl/http.c b/Utilities/cmcurl/lib/http.c similarity index 100% rename from Utilities/cmcurl/http.c rename to Utilities/cmcurl/lib/http.c diff --git a/Utilities/cmcurl/http.h b/Utilities/cmcurl/lib/http.h similarity index 100% rename from Utilities/cmcurl/http.h rename to Utilities/cmcurl/lib/http.h diff --git a/Utilities/cmcurl/http_chunks.c b/Utilities/cmcurl/lib/http_chunks.c similarity index 100% rename from Utilities/cmcurl/http_chunks.c rename to Utilities/cmcurl/lib/http_chunks.c diff --git a/Utilities/cmcurl/http_chunks.h b/Utilities/cmcurl/lib/http_chunks.h similarity index 100% rename from Utilities/cmcurl/http_chunks.h rename to Utilities/cmcurl/lib/http_chunks.h diff --git a/Utilities/cmcurl/http_digest.c b/Utilities/cmcurl/lib/http_digest.c similarity index 100% rename from Utilities/cmcurl/http_digest.c rename to Utilities/cmcurl/lib/http_digest.c diff --git a/Utilities/cmcurl/http_digest.h b/Utilities/cmcurl/lib/http_digest.h similarity index 100% rename from Utilities/cmcurl/http_digest.h rename to Utilities/cmcurl/lib/http_digest.h diff --git a/Utilities/cmcurl/http_negotiate.c b/Utilities/cmcurl/lib/http_negotiate.c similarity index 100% rename from Utilities/cmcurl/http_negotiate.c rename to Utilities/cmcurl/lib/http_negotiate.c diff --git a/Utilities/cmcurl/http_negotiate.h b/Utilities/cmcurl/lib/http_negotiate.h similarity index 100% rename from Utilities/cmcurl/http_negotiate.h rename to Utilities/cmcurl/lib/http_negotiate.h diff --git a/Utilities/cmcurl/http_ntlm.c b/Utilities/cmcurl/lib/http_ntlm.c similarity index 100% rename from Utilities/cmcurl/http_ntlm.c rename to Utilities/cmcurl/lib/http_ntlm.c diff --git a/Utilities/cmcurl/http_ntlm.h b/Utilities/cmcurl/lib/http_ntlm.h similarity index 100% rename from Utilities/cmcurl/http_ntlm.h rename to Utilities/cmcurl/lib/http_ntlm.h diff --git a/Utilities/cmcurl/if2ip.c b/Utilities/cmcurl/lib/if2ip.c similarity index 100% rename from Utilities/cmcurl/if2ip.c rename to Utilities/cmcurl/lib/if2ip.c diff --git a/Utilities/cmcurl/if2ip.h b/Utilities/cmcurl/lib/if2ip.h similarity index 100% rename from Utilities/cmcurl/if2ip.h rename to Utilities/cmcurl/lib/if2ip.h diff --git a/Utilities/cmcurl/inet_ntoa_r.h b/Utilities/cmcurl/lib/inet_ntoa_r.h similarity index 100% rename from Utilities/cmcurl/inet_ntoa_r.h rename to Utilities/cmcurl/lib/inet_ntoa_r.h diff --git a/Utilities/cmcurl/inet_ntop.c b/Utilities/cmcurl/lib/inet_ntop.c similarity index 100% rename from Utilities/cmcurl/inet_ntop.c rename to Utilities/cmcurl/lib/inet_ntop.c diff --git a/Utilities/cmcurl/inet_ntop.h b/Utilities/cmcurl/lib/inet_ntop.h similarity index 100% rename from Utilities/cmcurl/inet_ntop.h rename to Utilities/cmcurl/lib/inet_ntop.h diff --git a/Utilities/cmcurl/inet_pton.c b/Utilities/cmcurl/lib/inet_pton.c similarity index 100% rename from Utilities/cmcurl/inet_pton.c rename to Utilities/cmcurl/lib/inet_pton.c diff --git a/Utilities/cmcurl/inet_pton.h b/Utilities/cmcurl/lib/inet_pton.h similarity index 100% rename from Utilities/cmcurl/inet_pton.h rename to Utilities/cmcurl/lib/inet_pton.h diff --git a/Utilities/cmcurl/krb4.c b/Utilities/cmcurl/lib/krb4.c similarity index 100% rename from Utilities/cmcurl/krb4.c rename to Utilities/cmcurl/lib/krb4.c diff --git a/Utilities/cmcurl/krb4.h b/Utilities/cmcurl/lib/krb4.h similarity index 100% rename from Utilities/cmcurl/krb4.h rename to Utilities/cmcurl/lib/krb4.h diff --git a/Utilities/cmcurl/ldap.c b/Utilities/cmcurl/lib/ldap.c similarity index 100% rename from Utilities/cmcurl/ldap.c rename to Utilities/cmcurl/lib/ldap.c diff --git a/Utilities/cmcurl/ldap.h b/Utilities/cmcurl/lib/ldap.h similarity index 100% rename from Utilities/cmcurl/ldap.h rename to Utilities/cmcurl/lib/ldap.h diff --git a/Utilities/cmcurl/llist.c b/Utilities/cmcurl/lib/llist.c similarity index 100% rename from Utilities/cmcurl/llist.c rename to Utilities/cmcurl/lib/llist.c diff --git a/Utilities/cmcurl/llist.h b/Utilities/cmcurl/lib/llist.h similarity index 100% rename from Utilities/cmcurl/llist.h rename to Utilities/cmcurl/lib/llist.h diff --git a/Utilities/cmcurl/md5.c b/Utilities/cmcurl/lib/md5.c similarity index 100% rename from Utilities/cmcurl/md5.c rename to Utilities/cmcurl/lib/md5.c diff --git a/Utilities/cmcurl/md5.h b/Utilities/cmcurl/lib/md5.h similarity index 100% rename from Utilities/cmcurl/md5.h rename to Utilities/cmcurl/lib/md5.h diff --git a/Utilities/cmcurl/memdebug.c b/Utilities/cmcurl/lib/memdebug.c similarity index 100% rename from Utilities/cmcurl/memdebug.c rename to Utilities/cmcurl/lib/memdebug.c diff --git a/Utilities/cmcurl/memdebug.h b/Utilities/cmcurl/lib/memdebug.h similarity index 100% rename from Utilities/cmcurl/memdebug.h rename to Utilities/cmcurl/lib/memdebug.h diff --git a/Utilities/cmcurl/memory.h b/Utilities/cmcurl/lib/memory.h similarity index 100% rename from Utilities/cmcurl/memory.h rename to Utilities/cmcurl/lib/memory.h diff --git a/Utilities/cmcurl/mprintf.c b/Utilities/cmcurl/lib/mprintf.c similarity index 100% rename from Utilities/cmcurl/mprintf.c rename to Utilities/cmcurl/lib/mprintf.c diff --git a/Utilities/cmcurl/multi.c b/Utilities/cmcurl/lib/multi.c similarity index 100% rename from Utilities/cmcurl/multi.c rename to Utilities/cmcurl/lib/multi.c diff --git a/Utilities/cmcurl/multiif.h b/Utilities/cmcurl/lib/multiif.h similarity index 100% rename from Utilities/cmcurl/multiif.h rename to Utilities/cmcurl/lib/multiif.h diff --git a/Utilities/cmcurl/netrc.c b/Utilities/cmcurl/lib/netrc.c similarity index 100% rename from Utilities/cmcurl/netrc.c rename to Utilities/cmcurl/lib/netrc.c diff --git a/Utilities/cmcurl/netrc.h b/Utilities/cmcurl/lib/netrc.h similarity index 100% rename from Utilities/cmcurl/netrc.h rename to Utilities/cmcurl/lib/netrc.h diff --git a/Utilities/cmcurl/nwlib.c b/Utilities/cmcurl/lib/nwlib.c similarity index 100% rename from Utilities/cmcurl/nwlib.c rename to Utilities/cmcurl/lib/nwlib.c diff --git a/Utilities/cmcurl/parsedate.c b/Utilities/cmcurl/lib/parsedate.c similarity index 100% rename from Utilities/cmcurl/parsedate.c rename to Utilities/cmcurl/lib/parsedate.c diff --git a/Utilities/cmcurl/parsedate.h b/Utilities/cmcurl/lib/parsedate.h similarity index 100% rename from Utilities/cmcurl/parsedate.h rename to Utilities/cmcurl/lib/parsedate.h diff --git a/Utilities/cmcurl/progress.c b/Utilities/cmcurl/lib/progress.c similarity index 100% rename from Utilities/cmcurl/progress.c rename to Utilities/cmcurl/lib/progress.c diff --git a/Utilities/cmcurl/progress.h b/Utilities/cmcurl/lib/progress.h similarity index 100% rename from Utilities/cmcurl/progress.h rename to Utilities/cmcurl/lib/progress.h diff --git a/Utilities/cmcurl/security.c b/Utilities/cmcurl/lib/security.c similarity index 100% rename from Utilities/cmcurl/security.c rename to Utilities/cmcurl/lib/security.c diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/lib/select.c similarity index 100% rename from Utilities/cmcurl/select.c rename to Utilities/cmcurl/lib/select.c diff --git a/Utilities/cmcurl/select.h b/Utilities/cmcurl/lib/select.h similarity index 100% rename from Utilities/cmcurl/select.h rename to Utilities/cmcurl/lib/select.h diff --git a/Utilities/cmcurl/sendf.c b/Utilities/cmcurl/lib/sendf.c similarity index 100% rename from Utilities/cmcurl/sendf.c rename to Utilities/cmcurl/lib/sendf.c diff --git a/Utilities/cmcurl/sendf.h b/Utilities/cmcurl/lib/sendf.h similarity index 100% rename from Utilities/cmcurl/sendf.h rename to Utilities/cmcurl/lib/sendf.h diff --git a/Utilities/cmcurl/setup.h b/Utilities/cmcurl/lib/setup.h similarity index 100% rename from Utilities/cmcurl/setup.h rename to Utilities/cmcurl/lib/setup.h diff --git a/Utilities/cmcurl/setup_once.h b/Utilities/cmcurl/lib/setup_once.h similarity index 100% rename from Utilities/cmcurl/setup_once.h rename to Utilities/cmcurl/lib/setup_once.h diff --git a/Utilities/cmcurl/share.c b/Utilities/cmcurl/lib/share.c similarity index 100% rename from Utilities/cmcurl/share.c rename to Utilities/cmcurl/lib/share.c diff --git a/Utilities/cmcurl/share.h b/Utilities/cmcurl/lib/share.h similarity index 100% rename from Utilities/cmcurl/share.h rename to Utilities/cmcurl/lib/share.h diff --git a/Utilities/cmcurl/sockaddr.h b/Utilities/cmcurl/lib/sockaddr.h similarity index 100% rename from Utilities/cmcurl/sockaddr.h rename to Utilities/cmcurl/lib/sockaddr.h diff --git a/Utilities/cmcurl/socks.c b/Utilities/cmcurl/lib/socks.c similarity index 100% rename from Utilities/cmcurl/socks.c rename to Utilities/cmcurl/lib/socks.c diff --git a/Utilities/cmcurl/socks.h b/Utilities/cmcurl/lib/socks.h similarity index 100% rename from Utilities/cmcurl/socks.h rename to Utilities/cmcurl/lib/socks.h diff --git a/Utilities/cmcurl/speedcheck.c b/Utilities/cmcurl/lib/speedcheck.c similarity index 100% rename from Utilities/cmcurl/speedcheck.c rename to Utilities/cmcurl/lib/speedcheck.c diff --git a/Utilities/cmcurl/speedcheck.h b/Utilities/cmcurl/lib/speedcheck.h similarity index 100% rename from Utilities/cmcurl/speedcheck.h rename to Utilities/cmcurl/lib/speedcheck.h diff --git a/Utilities/cmcurl/splay.c b/Utilities/cmcurl/lib/splay.c similarity index 100% rename from Utilities/cmcurl/splay.c rename to Utilities/cmcurl/lib/splay.c diff --git a/Utilities/cmcurl/splay.h b/Utilities/cmcurl/lib/splay.h similarity index 100% rename from Utilities/cmcurl/splay.h rename to Utilities/cmcurl/lib/splay.h diff --git a/Utilities/cmcurl/ssh.c b/Utilities/cmcurl/lib/ssh.c similarity index 100% rename from Utilities/cmcurl/ssh.c rename to Utilities/cmcurl/lib/ssh.c diff --git a/Utilities/cmcurl/ssh.h b/Utilities/cmcurl/lib/ssh.h similarity index 100% rename from Utilities/cmcurl/ssh.h rename to Utilities/cmcurl/lib/ssh.h diff --git a/Utilities/cmcurl/sslgen.c b/Utilities/cmcurl/lib/sslgen.c similarity index 100% rename from Utilities/cmcurl/sslgen.c rename to Utilities/cmcurl/lib/sslgen.c diff --git a/Utilities/cmcurl/sslgen.h b/Utilities/cmcurl/lib/sslgen.h similarity index 100% rename from Utilities/cmcurl/sslgen.h rename to Utilities/cmcurl/lib/sslgen.h diff --git a/Utilities/cmcurl/ssluse.c b/Utilities/cmcurl/lib/ssluse.c similarity index 100% rename from Utilities/cmcurl/ssluse.c rename to Utilities/cmcurl/lib/ssluse.c diff --git a/Utilities/cmcurl/ssluse.h b/Utilities/cmcurl/lib/ssluse.h similarity index 100% rename from Utilities/cmcurl/ssluse.h rename to Utilities/cmcurl/lib/ssluse.h diff --git a/Utilities/cmcurl/strdup.c b/Utilities/cmcurl/lib/strdup.c similarity index 100% rename from Utilities/cmcurl/strdup.c rename to Utilities/cmcurl/lib/strdup.c diff --git a/Utilities/cmcurl/strdup.h b/Utilities/cmcurl/lib/strdup.h similarity index 100% rename from Utilities/cmcurl/strdup.h rename to Utilities/cmcurl/lib/strdup.h diff --git a/Utilities/cmcurl/strequal.c b/Utilities/cmcurl/lib/strequal.c similarity index 100% rename from Utilities/cmcurl/strequal.c rename to Utilities/cmcurl/lib/strequal.c diff --git a/Utilities/cmcurl/strequal.h b/Utilities/cmcurl/lib/strequal.h similarity index 100% rename from Utilities/cmcurl/strequal.h rename to Utilities/cmcurl/lib/strequal.h diff --git a/Utilities/cmcurl/strerror.c b/Utilities/cmcurl/lib/strerror.c similarity index 100% rename from Utilities/cmcurl/strerror.c rename to Utilities/cmcurl/lib/strerror.c diff --git a/Utilities/cmcurl/strerror.h b/Utilities/cmcurl/lib/strerror.h similarity index 100% rename from Utilities/cmcurl/strerror.h rename to Utilities/cmcurl/lib/strerror.h diff --git a/Utilities/cmcurl/strtok.c b/Utilities/cmcurl/lib/strtok.c similarity index 100% rename from Utilities/cmcurl/strtok.c rename to Utilities/cmcurl/lib/strtok.c diff --git a/Utilities/cmcurl/strtok.h b/Utilities/cmcurl/lib/strtok.h similarity index 100% rename from Utilities/cmcurl/strtok.h rename to Utilities/cmcurl/lib/strtok.h diff --git a/Utilities/cmcurl/strtoofft.c b/Utilities/cmcurl/lib/strtoofft.c similarity index 100% rename from Utilities/cmcurl/strtoofft.c rename to Utilities/cmcurl/lib/strtoofft.c diff --git a/Utilities/cmcurl/strtoofft.h b/Utilities/cmcurl/lib/strtoofft.h similarity index 100% rename from Utilities/cmcurl/strtoofft.h rename to Utilities/cmcurl/lib/strtoofft.h diff --git a/Utilities/cmcurl/telnet.c b/Utilities/cmcurl/lib/telnet.c similarity index 100% rename from Utilities/cmcurl/telnet.c rename to Utilities/cmcurl/lib/telnet.c diff --git a/Utilities/cmcurl/telnet.h b/Utilities/cmcurl/lib/telnet.h similarity index 100% rename from Utilities/cmcurl/telnet.h rename to Utilities/cmcurl/lib/telnet.h diff --git a/Utilities/cmcurl/tftp.c b/Utilities/cmcurl/lib/tftp.c similarity index 100% rename from Utilities/cmcurl/tftp.c rename to Utilities/cmcurl/lib/tftp.c diff --git a/Utilities/cmcurl/tftp.h b/Utilities/cmcurl/lib/tftp.h similarity index 100% rename from Utilities/cmcurl/tftp.h rename to Utilities/cmcurl/lib/tftp.h diff --git a/Utilities/cmcurl/timeval.c b/Utilities/cmcurl/lib/timeval.c similarity index 100% rename from Utilities/cmcurl/timeval.c rename to Utilities/cmcurl/lib/timeval.c diff --git a/Utilities/cmcurl/timeval.h b/Utilities/cmcurl/lib/timeval.h similarity index 100% rename from Utilities/cmcurl/timeval.h rename to Utilities/cmcurl/lib/timeval.h diff --git a/Utilities/cmcurl/transfer.c b/Utilities/cmcurl/lib/transfer.c similarity index 100% rename from Utilities/cmcurl/transfer.c rename to Utilities/cmcurl/lib/transfer.c diff --git a/Utilities/cmcurl/transfer.h b/Utilities/cmcurl/lib/transfer.h similarity index 100% rename from Utilities/cmcurl/transfer.h rename to Utilities/cmcurl/lib/transfer.h diff --git a/Utilities/cmcurl/url.c b/Utilities/cmcurl/lib/url.c similarity index 100% rename from Utilities/cmcurl/url.c rename to Utilities/cmcurl/lib/url.c diff --git a/Utilities/cmcurl/url.h b/Utilities/cmcurl/lib/url.h similarity index 100% rename from Utilities/cmcurl/url.h rename to Utilities/cmcurl/lib/url.h diff --git a/Utilities/cmcurl/urldata.h b/Utilities/cmcurl/lib/urldata.h similarity index 100% rename from Utilities/cmcurl/urldata.h rename to Utilities/cmcurl/lib/urldata.h diff --git a/Utilities/cmcurl/version.c b/Utilities/cmcurl/lib/version.c similarity index 100% rename from Utilities/cmcurl/version.c rename to Utilities/cmcurl/lib/version.c