Source Format Enforcement (#665)

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

diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am
index f8ac12531ddb745f96d707a9bc529a28f3da23fa..8e53973231811b94f5008184d0d6df0ebf85b785 100644 (file)
--- a/src/acl/Makefile.am
+++ b/src/acl/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.
@@ -8,6 +8,8 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
+SUBDIRS= external
+
 noinst_LTLIBRARIES = libapi.la libstate.la libacls.la
 
 ## General data-independent ACL API
@@ -18,44 +20,52 @@ libapi_la_SOURCES = \
        BoolOps.h \
        Checklist.cc \
        Checklist.h \
-       forward.h \
        InnerNode.cc \
        InnerNode.h \
+       Options.cc \
+       Options.h \
        Tree.cc \
-       Tree.h
+       Tree.h \
+       forward.h
 
 ## Data-dependent Squid/transaction state used by specific ACLs.
 ## Does not refer to specific ACLs to avoid circular dependencies.
 libstate_la_SOURCES = \
+       Address.cc \
+       Address.h \
+       CharacterSetOption.h \
        Data.h \
-       Strategy.h \
-       Strategised.cc \
-       Strategised.h \
        FilledChecklist.cc \
        FilledChecklist.h \
-       Address.h \
-       Address.cc
+       Strategised.cc \
+       Strategised.h \
+       Strategy.h
 
 ## data-specific ACLs
 libacls_la_SOURCES = \
-       IntRange.cc \
-       IntRange.h \
-       RegexData.cc \
-       RegexData.h \
-       StringData.cc \
-       StringData.h \
-       Time.cc \
-       Time.h \
-       TimeData.cc \
-       TimeData.h \
+       AclDenyInfoList.h \
+       AclSizeLimit.cc \
+       AclSizeLimit.h \
        AllOf.cc \
        AllOf.h \
+       AnnotateClient.cc \
+       AnnotateClient.h \
+       AnnotateTransaction.cc \
+       AnnotateTransaction.h \
+       AnnotationData.cc \
+       AnnotationData.h \
        AnyOf.cc \
        AnyOf.h \
        Asn.cc \
        Asn.h \
-       Browser.cc \
-       Browser.h \
+       AtStep.cc \
+       AtStep.h \
+       AtStepData.cc \
+       AtStepData.h \
+       ConnMark.cc \
+       ConnMark.h \
+       ConnectionsEncrypted.cc \
+       ConnectionsEncrypted.h \
        DestinationAsn.h \
        DestinationDomain.cc \
        DestinationDomain.h \
@@ -65,10 +75,16 @@ libacls_la_SOURCES = \
        DomainData.h \
        ExtUser.cc \
        ExtUser.h \
-       HierCodeData.cc \
-       HierCodeData.h \
+       Gadgets.cc \
+       Gadgets.h \
+       HasComponent.cc \
+       HasComponent.h \
+       HasComponentData.cc \
+       HasComponentData.h \
        HierCode.cc \
        HierCode.h \
+       HierCodeData.cc \
+       HierCodeData.h \
        HttpHeaderData.cc \
        HttpHeaderData.h \
        HttpRepHeader.cc \
@@ -77,6 +93,8 @@ libacls_la_SOURCES = \
        HttpReqHeader.h \
        HttpStatus.cc \
        HttpStatus.h \
+       IntRange.cc \
+       IntRange.h \
        Ip.cc \
        Ip.h \
        LocalIp.cc \
@@ -86,42 +104,48 @@ libacls_la_SOURCES = \
        MaxConnection.cc \
        MaxConnection.h \
        Method.cc \
+       Method.h \
        MethodData.cc \
        MethodData.h \
-       Method.h \
        MyPortName.cc \
        MyPortName.h \
-       Note.h \
        Note.cc \
-       NoteData.h \
+       Note.h \
        NoteData.cc \
+       NoteData.h \
        PeerName.cc \
        PeerName.h \
        Protocol.cc \
+       Protocol.h \
        ProtocolData.cc \
        ProtocolData.h \
-       Protocol.h \
        Random.cc \
        Random.h \
-       Referer.cc \
-       Referer.h \
+       RegexData.cc \
+       RegexData.h \
        ReplyHeaderStrategy.h \
-       ReplyMimeType.cc \
        ReplyMimeType.h \
        RequestHeaderStrategy.h \
-       RequestMimeType.cc \
        RequestMimeType.h \
        SourceAsn.h \
        SourceDomain.cc \
        SourceDomain.h \
        SourceIp.cc \
        SourceIp.h \
-       SquidError.h \
        SquidError.cc \
+       SquidError.h \
        SquidErrorData.cc \
        SquidErrorData.h \
+       StringData.cc \
+       StringData.h \
        Tag.cc \
        Tag.h \
+       Time.cc \
+       Time.h \
+       TimeData.cc \
+       TimeData.h \
+       TransactionInitiator.cc \
+       TransactionInitiator.h \
        Url.cc \
        Url.h \
        UrlLogin.cc \
@@ -131,30 +155,18 @@ libacls_la_SOURCES = \
        UrlPort.cc \
        UrlPort.h \
        UserData.cc \
-       UserData.h \
-       AclNameList.h \
-       AclDenyInfoList.h \
-       Gadgets.cc \
-       Gadgets.h \
-       AclSizeLimit.cc \
-       AclSizeLimit.h
+       UserData.h
 
 ## Add conditional sources
-## TODO: move these to their respectful dirs when those dirs are created
+## TODO: move these to their respective dirs when those dirs are created
 
 EXTRA_libacls_la_SOURCES =
 
 SSL_ACLS = \
-       AtStep.cc \
-       AtStep.h \
-       AtStepData.cc \
-       AtStepData.h \
         CertificateData.cc \
         CertificateData.h  \
         Certificate.cc \
         Certificate.h  \
-       ConnectionsEncrypted.cc \
-       ConnectionsEncrypted.h \
        ServerCertificate.cc \
        ServerCertificate.h \
        ServerName.cc \
@@ -167,22 +179,22 @@ SSL_ACLS = \
 if ENABLE_SSL
 libacls_la_SOURCES += $(SSL_ACLS)
 endif
+EXTRA_libacls_la_SOURCES += $(SSL_ACLS)
 
-if USE_ADAPTATION
-libacls_la_SOURCES += AdaptationService.h \
+ADAPT_ACLS= \
+       AdaptationService.h \
        AdaptationService.cc \
        AdaptationServiceData.h \
        AdaptationServiceData.cc
-endif
-
-
-EXTRA_libacls_la_SOURCES += $(SSL_ACLS)
 
+if ENABLE_ADAPTATION
+libacls_la_SOURCES += $(ADAPT_ACLS)
+endif
+EXTRA_libacls_la_SOURCES += $(ADAPT_ACLS)
 
 ARP_ACLS = Arp.cc Arp.h Eui64.cc Eui64.h
 
-if USE_SQUID_EUI
+if ENABLE_EUI
 libacls_la_SOURCES += $(ARP_ACLS)
 endif
-
 EXTRA_libacls_la_SOURCES += $(ARP_ACLS)