SourceFormat Enforcement

[thirdparty/squid.git] / src / ssl / Makefile.am

diff --git a/src/ssl/Makefile.am b/src/ssl/Makefile.am
index ae235646b8e8d8000fd6177e24072801680f3d92..d556dfe7c9616ab8dcdd2d8b281d1c3ffc1c1a9e 100644 (file)
--- a/src/ssl/Makefile.am
+++ b/src/ssl/Makefile.am
@@ -1,21 +1,16 @@
+## Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
 noinst_LTLIBRARIES = libsslsquid.la libsslutil.la
 
-EXTRA_PROGRAMS = \
-       ssl_crtd
-
-EXTRA_DIST = \
-       ssl_crtd.8
-
-if USE_SSL_CRTD
-SSL_CRTD = ssl_crtd
-else
-SSL_CRTD =
-endif
-
-## SSL stuff used by main Squid but not by ssl_crtd
+## SSL stuff used by main Squid but not by certgen helper
 libsslsquid_la_SOURCES = \
        bio.cc \
        bio.h \
@@ -29,8 +24,8 @@ libsslsquid_la_SOURCES = \
        ErrorDetail.h \
        ErrorDetailManager.cc \
        ErrorDetailManager.h \
-       PeerConnector.cc \
-       PeerConnector.h \
+       PeekingPeerConnector.cc \
+       PeekingPeerConnector.h \
        ProxyCerts.h \
        ServerBump.cc \
        ServerBump.h \
@@ -39,17 +34,9 @@ libsslsquid_la_SOURCES = \
        helper.cc \
        helper.h
 
-## SSL stuff used by main Squid and ssl_crtd
+## SSL stuff used by main Squid and certgen helper
 libsslutil_la_SOURCES = \
        gadgets.cc \
        gadgets.h \
        crtd_message.cc \
        crtd_message.h
-
-libexec_PROGRAMS = \
-       $(SSL_CRTD)
-
-if USE_SSL_CRTD
-ssl_crtd_SOURCES = ssl_crtd.cc certificate_db.cc certificate_db.h
-ssl_crtd_LDADD = libsslutil.la $(SSLLIB) $(COMPAT_LIB)
-endif