Bug 4692: SslBump breaks intercepted IPv6 connections

[thirdparty/squid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 005711a46bcc8092c56f4bc5ecc724ac5b8f55f2..20d8330c8f1a655726ade857e81fde07811036e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,17 @@
-## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+## 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.
 ##
 
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
+AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
+DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc src test-suite tools
 SUBDIRS                = compat lib
 if ENABLE_LOADABLE_MODULES
 SUBDIRS += libltdl
 endif
-SUBDIRS += scripts icons errors doc helpers src tools test-suite
+SUBDIRS += scripts icons errors doc src tools test-suite
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -27,16 +27,6 @@ dist-hook:
            rm -f $(distdir)/$$subdir/autoconf.h; \
          fi; \
        done
-       @if [ -f $(top_srcdir)/RELEASENOTES.html ]; then \
-         cp -p $(top_srcdir)/RELEASENOTES.html $(distdir)/RELEASENOTES.html; \
-       else \
-         notes=`ls -1rt $(top_srcdir)/doc/release-notes/*.html | head -1`; \
-         if [ -f $$notes ]; then \
-           cp $$notes $(distdir)/RELEASENOTES.html; \
-         else \
-           touch $(distdir)/RELEASENOTES.html; \
-         fi; \
-       fi
 
 EXTRA_DIST = \
        ChangeLog \
@@ -58,7 +48,7 @@ install-pinger:
 check: have-cppunit check-recursive
 
 have-cppunit:
-       @if test "$(SQUID_CPPUNIT_INC)$(SQUID_CPPUNIT_LA)$(SQUID_CPPUNIT_LIBS)" = "" ; then \
+       @if test "$(LIBCPPUNIT_CFLAGS)$(LIBCPPUNIT_LIBS)" = "" ; then \
                echo "FATAL: 'make check' requires cppunit and cppunit development packages. They do not appear to be installed." ; \
                exit 1 ; \
        fi