summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-08-16 16:01:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-08-17 16:57:55 +0200
commit5b2d703fe5900fcda846e41d67c62f62dd755839 (patch)
treef47f0f8f2db285ffc52bf2c65eedb2112ac031d0
parent7c31a8980cd13f08cc477c83134dd4301ea6822e (diff)
downloadcurl-5b2d703fe5900fcda846e41d67c62f62dd755839.tar.gz
vssh: create directory for SSH backend code
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/Makefile.inc6
-rw-r--r--lib/vssh/libssh.c (renamed from lib/ssh-libssh.c)0
-rw-r--r--lib/vssh/libssh2.c (renamed from lib/ssh.c)0
4 files changed, 5 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5d41c2be3..516a2394d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -138,7 +138,7 @@ CS_ = $(CS_0)
checksrc:
$(CHECKSRC)(@PERL@ $(srcdir)/checksrc.pl -D$(srcdir) -W$(srcdir)/curl_config.h \
- $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch])
+ $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch] $(srcdir)/vssh/*.[ch])
if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index c726cacf5..de37f2e3b 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -41,6 +41,8 @@ LIB_VQUIC_CFILES = vquic/ngtcp2.c vquic/ngtcp2-crypto.c vquic/quiche.c
LIB_VQUIC_HFILES = vquic/ngtcp2.h vquic/ngtcp2-crypto.h vquic/quiche.h
+LIB_VSSH_CFILES = vssh/libssh2.c vssh/libssh.c
+
LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c \
@@ -50,7 +52,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
http_digest.c md4.c md5.c http_negotiate.c inet_pton.c strtoofft.c \
strerror.c amigaos.c hostasyn.c hostip4.c hostip6.c hostsyn.c \
inet_ntop.c parsedate.c select.c tftp.c splay.c strdup.c socks.c \
- ssh.c ssh-libssh.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
+ curl_addrinfo.c socks_gssapi.c socks_sspi.c \
curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
pingpong.c rtsp.c curl_threads.c warnless.c hmac.c curl_rtmp.c \
openldap.c curl_gethostname.c gopher.c idn_win32.c \
@@ -85,6 +87,6 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
LIB_RCFILES = libcurl.rc
CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \
- $(LIB_VQUIC_CFILES)
+ $(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES)
HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \
$(LIB_VQUIC_HFILES)
diff --git a/lib/ssh-libssh.c b/lib/vssh/libssh.c
index 4b34b0212..4b34b0212 100644
--- a/lib/ssh-libssh.c
+++ b/lib/vssh/libssh.c
diff --git a/lib/ssh.c b/lib/vssh/libssh2.c
index 5dd6ee29e..5dd6ee29e 100644
--- a/lib/ssh.c
+++ b/lib/vssh/libssh2.c