Source Format Enforcement (#763)

[thirdparty/squid.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bc46a4aa66608627d52a2d7e09032089a76827dd..cc392be4c0adb981cf97ae29c899be66c58ce361 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.
@@ -11,7 +11,7 @@ DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib
 SUBDIRS=
 EXTRA_DIST=
 
-if USE_ESI
+if ENABLE_ESI
 SUBDIRS += libTrie
 endif
 if ENABLE_SNMP
@@ -37,9 +37,12 @@ if ENABLE_WIN32SPECIFIC
 noinst_LTLIBRARIES += libsspwin32.la
 libsspwin32_la_SOURCES = sspwin32.cc
 else
-SUBDIRS += rfcnb smblib
 EXTRA_DIST += sspwin32.cc
 endif
+if ENABLE_SMBLIB
+# smblib is the only user of the rfcnb library
+SUBDIRS += rfcnb smblib
+endif
 if ENABLE_AUTH_NTLM
 SUBDIRS += ntlmauth
 endif
@@ -54,24 +57,22 @@ EXTRA_libmiscutil_la_SOURCES = \
 
 libmiscencoding_la_SOURCES = \
        base64.c \
-       charset.c \
        html_quote.c \
        md5.c \
        rfc1738.c \
-       rfc2617.c \
-       uudecode.c
+       rfc2617.c
 
 libmisccontainers_la_SOURCES = \
        hash.cc
 
 libmiscutil_la_SOURCES = \
+       $(SNPRINTFSOURCE) \
+       Splay.cc \
        getfullhostname.c \
        heap.c \
        iso3307.c \
        radix.c \
        rfc1123.c \
-       $(SNPRINTFSOURCE) \
-       Splay.cc \
        stub_memaccount.c \
        util.c \
        xusleep.c
@@ -80,14 +81,14 @@ TESTS += tests/testRFC1738
 
 check_PROGRAMS += tests/testRFC1738
 
-tests_testRFC1738_SOURCES= \
-       tests/testRFC1738.h \
-       tests/testRFC1738.cc
+tests_testRFC1738_SOURCES = \
+       tests/testRFC1738.cc \
+       tests/testRFC1738.h
 
 tests_testRFC1738_LDADD= \
-       $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(LIBCPPUNIT_LIBS) \
        $(COMPAT_LIB)
 
 tests_testRFC1738_LDFLAGS = $(LIBADD_DL)