Commit eccf4fb7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

vtls: created subdir, moved sslgen.[ch] there, updated all include lines

parent 9f260b5d

lib/Makefile.am

+4 −9
Original line number Diff line number Diff line
@@ -60,20 +60,15 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ 
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file

# $(top_srcdir)/ares is for in-tree c-ares's external include files



if USE_EMBEDDED_ARES

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \

              -I$(top_srcdir)/lib            \

              -I$(top_builddir)/ares         \

              -I$(top_srcdir)/ares

else

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \

              -I$(top_srcdir)/lib



if USE_EMBEDDED_ARES

AM_CPPFLAGS += -I$(top_builddir)/ares        \

               -I$(top_srcdir)/ares

endif



# Prevent LIBS from being used for all link targets

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ 
  content_encoding.c share.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 gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\

  select.c gtls.c vtls/sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\

  qssl.c rawstr.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 polarssl.c		\
@@ -36,7 +36,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ 
  connect.h llist.h hash.h content_encoding.h share.h curl_md4.h	\

  curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h	\

  strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h curl_setup.h	\

  transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h	\

  transfer.h select.h easyif.h multiif.h parsedate.h vtls/sslgen.h gtls.h	\

  tftp.h sockaddr.h splay.h strdup.h socks.h ssh.h nssg.h curl_base64.h	\

  rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h		\

  curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h	\

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
#include "sockaddr.h" /* required for Curl_sockaddr_storage */

#include "inet_ntop.h"

#include "inet_pton.h"

#include "sslgen.h" /* for Curl_ssl_check_cxn() */

#include "vtls/sslgen.h" /* for Curl_ssl_check_cxn() */

#include "progress.h"

#include "warnless.h"

#include "conncache.h"

lib/curl_ntlm_msgs.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#  include "curl_sspi.h"

#endif



#include "sslgen.h"

#include "vtls/sslgen.h"



#define BUILDING_CURL_NTLM_MSGS_C

#include "curl_ntlm_msgs.h"

lib/curl_sasl.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


#include "curl_base64.h"

#include "curl_md5.h"

#include "sslgen.h"

#include "vtls/sslgen.h"

#include "curl_hmac.h"

#include "curl_ntlm_msgs.h"

#include "curl_sasl.h"