From: Amos Jeffries Date: Tue, 9 Feb 2016 08:57:33 +0000 (+1300) Subject: Cleanup: convenience library renaming X-Git-Tag: SQUID_4_0_5~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca3a08e2c31bee57a47956a860b03baf2ebd162e;p=thirdparty%2Fsquid.git Cleanup: convenience library renaming I have been trying to automate graphing of the Squid internal dependencies. One of the major issues that has encountered is that some of our convenience libraries use the '-' hyphen character which is a reserved character in DOT graph format. To make the scripts much simpler and the visual output reflect exactly what the library names are this patch cleans up the libraries to follow our pre-existing policy, and now also to remove punctuation from library names. Which condition has been added to the guidelines documentation. --- diff --git a/compat/Makefile.am b/compat/Makefile.am index 66442375d3..15ab0634ef 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -14,8 +14,8 @@ include $(top_srcdir)/src/Common.am # Port Specific Configurations -noinst_LTLIBRARIES = libcompat-squid.la -libcompat_squid_la_SOURCES = \ +noinst_LTLIBRARIES = libcompatsquid.la +libcompatsquid_la_SOURCES = \ assert.cc \ assert.h \ cmsg.h \ @@ -86,7 +86,7 @@ libcompat_squid_la_SOURCES = \ os/solaris.h \ os/sunos.h -libcompat_squid_la_LIBADD= $(LTLIBOBJS) +libcompatsquid_la_LIBADD= $(LTLIBOBJS) check_PROGRAMS += testPreCompiler TESTS += testPreCompiler diff --git a/compat/compat.dox b/compat/compat.dox index 333368dcf3..7cf7d95552 100644 --- a/compat/compat.dox +++ b/compat/compat.dox @@ -22,7 +22,7 @@ some older hacks, and some cases of obsolete algorithms sitting side by side wit current equivalent. \par -The Portability library libcompat-squid.la has been created to correct the three issues of +The Portability library libcompatsquid.la has been created to correct the three issues of stable build portability, code cleanliness, and clearer licensing. @@ -38,7 +38,7 @@ But they are required to meet several other criteria: available to be included with the Squid sources and used when required. \par -To be built into the libcompat-squid.la as a layer below all Squid-bundled binaries. The +To be built into the libcompatsquid.la as a layer below all Squid-bundled binaries. The code must also qualify by being provided natively by some OS where Squid builds. \br Code and Algorithms which do not meet this final criteria are relegated to the slightly higher level of basic component, rather than portability. @@ -71,7 +71,7 @@ handling and memory allocation. \section sec4 Layout -The internal code structure of libcompat-squid.la files has a hierarchy. The API has a flat +The internal code structure of libcompatsquid.la files has a hierarchy. The API has a flat global scope separate from the file layout. The API is pulled in by including compat/compat.h. The strict dependency requirements which exist within the compat API make including an individual part separately a risky operation. diff --git a/configure.ac b/configure.ac index 75c3f34091..84e4f44d95 100644 --- a/configure.ac +++ b/configure.ac @@ -1011,7 +1011,7 @@ AM_CONDITIONAL(USE_ECAP, test "x$squid_opt_use_ecap" = "xyes") if test "x$squid_opt_use_ecap" = "xyes"; then AC_DEFINE(USE_ECAP,1,[Enable eCAP support]) - ECAP_LIBS="ecap/libsquid-ecap.la" + ECAP_LIBS="ecap/libecapsquid.la" squid_opt_use_adaptation=yes else AC_DEFINE(USE_ECAP,0,[Disable eCAP support]) diff --git a/src/Common.am b/src/Common.am index 552820faec..886bcc9fa6 100644 --- a/src/Common.am +++ b/src/Common.am @@ -50,7 +50,7 @@ LIBPROFILER= endif ## Because compatibility is almost universal. And the link order is important. -COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) +COMPAT_LIB = $(top_builddir)/compat/libcompatsquid.la $(LIBPROFILER) ## Some helpers are written in Perl and need the local shell defined properly subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) diff --git a/src/Makefile.am b/src/Makefile.am index 14a4c23a3c..a2a3207fda 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -553,8 +553,8 @@ squid_LDADD = \ servers/libservers.la \ ftp/libftp.la \ helper/libhelper.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ dns/libdns.la \ base/libbase.la \ libsquid.la \ @@ -568,7 +568,7 @@ squid_LDADD = \ comm/libcomm.la \ security/libsecurity.la \ eui/libeui.la \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ log/liblog.la \ format/libformat.la \ $(XTRA_OBJS) \ @@ -1044,8 +1044,8 @@ nodist_tests_testHttpReply_SOURCES=\ tests_testHttpReply_LDFLAGS = $(LIBADD_DL) tests_testHttpReply_LDADD=\ CommCalls.o \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ acl/libacls.la \ acl/libapi.la \ acl/libstate.la \ @@ -1176,8 +1176,8 @@ nodist_tests_testACLMaxUserIP_SOURCES= \ tests_testACLMaxUserIP_LDADD= \ libsquid.la \ helper/libhelper.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ $(AUTH_ACL_LIBS) \ ident/libident.la \ acl/libacls.la \ @@ -1448,8 +1448,8 @@ tests_testCacheManager_LDADD = \ servers/libservers.la \ ftp/libftp.la \ helper/libhelper.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ @@ -1460,7 +1460,7 @@ tests_testCacheManager_LDADD = \ fs/libfs.la \ comm/libcomm.la \ eui/libeui.la \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ log/liblog.la \ format/libformat.la \ $(REPL_OBJS) \ @@ -1630,8 +1630,8 @@ nodist_tests_testDiskIO_SOURCES= \ swap_log_op.cc tests_testDiskIO_LDADD = \ libsquid.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ SquidConfig.o \ CommCalls.o \ ident/libident.la \ @@ -1892,8 +1892,8 @@ tests_testEvent_LDADD = \ servers/libservers.la \ ftp/libftp.la \ helper/libhelper.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ @@ -1903,7 +1903,7 @@ tests_testEvent_LDADD = \ ip/libip.la \ fs/libfs.la \ anyp/libanyp.la \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ comm/libcomm.la \ log/liblog.la \ format/libformat.la \ @@ -2137,8 +2137,8 @@ tests_testEventLoop_LDADD = \ servers/libservers.la \ ftp/libftp.la \ helper/libhelper.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ @@ -2148,7 +2148,7 @@ tests_testEventLoop_LDADD = \ ip/libip.la \ fs/libfs.la \ anyp/libanyp.la \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ comm/libcomm.la \ log/liblog.la \ format/libformat.la \ @@ -2377,17 +2377,17 @@ tests_test_http_range_LDADD = \ servers/libservers.la \ ftp/libftp.la \ helper/libhelper.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ acl/libapi.la \ - parser/libsquid-parser.la \ + parser/libparser.la \ ip/libip.la \ fs/libfs.la \ anyp/libanyp.la \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ comm/libcomm.la \ log/liblog.la \ format/libformat.la \ @@ -2432,7 +2432,7 @@ nodist_tests_testTokenizer_SOURCES = \ tests/stub_SBufDetailedStats.cc tests_testTokenizer_LDFLAGS = $(LIBADD_DL) tests_testTokenizer_LDADD = \ - parser/libsquid-parser.la \ + parser/libparser.la \ base/libbase.la \ $(top_builddir)/lib/libmiscutil.la \ $(COMPAT_LIB) \ @@ -2475,8 +2475,8 @@ tests_testHttp1Parser_SOURCES = \ nodist_tests_testHttp1Parser_SOURCES = \ $(TESTSOURCES) tests_testHttp1Parser_LDADD= \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ anyp/libanyp.la \ SquidConfig.o \ base/libbase.la \ @@ -2694,23 +2694,23 @@ tests_testHttpRequest_LDADD = \ servers/libservers.la \ helper/libhelper.la \ ftp/libftp.la \ - http/libsquid-http.la \ + http/libhttp.la \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ acl/libapi.la \ - parser/libsquid-parser.la \ + parser/libparser.la \ ip/libip.la \ fs/libfs.la \ $(SSL_LIBS) \ ipc/libipc.la \ - parser/libsquid-parser.la \ + parser/libparser.la \ dns/libdns.la \ base/libbase.la \ mgr/libmgr.la \ anyp/libanyp.la \ $(SNMP_LIBS) \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ comm/libcomm.la \ log/liblog.la \ format/libformat.la \ @@ -2735,7 +2735,7 @@ tests_testHttpRequest_DEPENDENCIES = \ $(SQUID_CPPUNIT_LA) ## Tests for icmp/* objects -# icmp/libicmp-core.la is used by pinger so SHOULD NOT require more dependancies! :-( +# icmp/libicmpcore.la is used by pinger so SHOULD NOT require more dependancies! :-( tests_testIcmp_SOURCES = \ tests/testIcmp.h \ tests/testIcmp.cc @@ -2748,7 +2748,7 @@ nodist_tests_testIcmp_SOURCES = \ globals.cc tests_testIcmp_LDFLAGS = $(LIBADD_DL) tests_testIcmp_LDADD=\ - icmp/libicmp-core.la \ + icmp/libicmpcore.la \ ip/libip.la \ base/libbase.la \ $(COMPAT_LIB) \ @@ -2915,8 +2915,8 @@ nodist_tests_testStore_SOURCES= \ tests_testStore_LDADD= \ libsquid.la \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ @@ -3139,8 +3139,8 @@ nodist_tests_testUfs_SOURCES = \ SquidMath.h \ swap_log_op.cc tests_testUfs_LDADD = \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ CommCalls.o \ ident/libident.la \ acl/libacls.la \ @@ -3320,8 +3320,8 @@ nodist_tests_testRock_SOURCES = \ SquidMath.h \ $(TESTSOURCES) tests_testRock_LDADD = \ - http/libsquid-http.la \ - parser/libsquid-parser.la \ + http/libhttp.la \ + parser/libparser.la \ libsquid.la \ comm/libcomm.la \ ip/libip.la \ @@ -3558,9 +3558,9 @@ tests_testURL_LDADD = \ clients/libclients.la \ servers/libservers.la \ helper/libhelper.la \ - http/libsquid-http.la \ + http/libhttp.la \ ftp/libftp.la \ - parser/libsquid-parser.la \ + parser/libparser.la \ anyp/libanyp.la \ ident/libident.la \ acl/libacls.la \ @@ -3575,7 +3575,7 @@ tests_testURL_LDADD = \ ipc/libipc.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ - icmp/libicmp.la icmp/libicmp-core.la \ + icmp/libicmp.la \ comm/libcomm.la \ log/liblog.la \ format/libformat.la \ diff --git a/src/adaptation/ecap/Makefile.am b/src/adaptation/ecap/Makefile.am index 06e1c89f1c..03eb06e4d2 100644 --- a/src/adaptation/ecap/Makefile.am +++ b/src/adaptation/ecap/Makefile.am @@ -8,9 +8,9 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am -noinst_LTLIBRARIES = libsquid-ecap.la +noinst_LTLIBRARIES = libecapsquid.la -libsquid_ecap_la_SOURCES = \ +libecapsquid_la_SOURCES = \ Config.h \ Config.cc \ Host.h \ @@ -25,5 +25,5 @@ libsquid_ecap_la_SOURCES = \ Registry.h # add libecap using its pkg-config-produced configuration variables -libsquid_ecap_la_CXXFLAGS = $(EXT_LIBECAP_CFLAGS) -libsquid_ecap_la_LIBADD = $(EXT_LIBECAP_LIBS) +libecapsquid_la_CXXFLAGS = $(EXT_LIBECAP_CFLAGS) +libecapsquid_la_LIBADD = $(EXT_LIBECAP_LIBS) diff --git a/src/http/Makefile.am b/src/http/Makefile.am index d75758a4d1..b3071bb162 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -11,9 +11,9 @@ include $(top_srcdir)/src/TestHeaders.am SUBDIRS = one url_rewriters DIST_SUBDIRS = one url_rewriters -noinst_LTLIBRARIES = libsquid-http.la +noinst_LTLIBRARIES = libhttp.la -libsquid_http_la_SOURCES = \ +libhttp_la_SOURCES = \ forward.h \ MethodType.cc \ MethodType.h \ @@ -30,7 +30,7 @@ libsquid_http_la_SOURCES = \ Stream.cc \ Stream.h -libsquid_http_la_LIBADD= one/libhttp1.la +libhttp_la_LIBADD= one/libhttp1.la MethodType.cc: MethodType.h $(top_srcdir)/src/mk-string-arrays.awk ($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk sbuf=1 < $(srcdir)/MethodType.h | \ diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am index d20bf0984b..685ea87d83 100644 --- a/src/icmp/Makefile.am +++ b/src/icmp/Makefile.am @@ -21,10 +21,10 @@ else EXTRA_PROGRAMS = pinger endif -noinst_LTLIBRARIES = libicmp-core.la libicmp.la +noinst_LTLIBRARIES = libicmpcore.la libicmp.la # ICMP API definition ... -libicmp_core_la_SOURCES = \ +libicmpcore_la_SOURCES = \ Icmp.h \ Icmp.cc @@ -37,6 +37,8 @@ libicmp_la_SOURCES = \ net_db.h \ net_db.cc +libicmp_la_LIBADD= libicmpcore.la + # pinger depends on these but install/dist is done elsewhere. COPIED_SOURCE= \ debug.cc \ @@ -61,7 +63,7 @@ pinger_SOURCES = \ nodist_pinger_SOURCES = $(COPIED_SOURCE) pinger_LDFLAGS = $(LIBADD_DL) pinger_LDADD=\ - libicmp-core.la \ + libicmpcore.la \ $(top_builddir)/src/ip/libip.la \ $(top_builddir)/src/base/libbase.la \ $(COMPAT_LIB) \ diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 350e8b46e3..869f71be1f 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -8,9 +8,9 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am -noinst_LTLIBRARIES = libsquid-parser.la +noinst_LTLIBRARIES = libparser.la -libsquid_parser_la_SOURCES = \ +libparser_la_SOURCES = \ Tokenizer.h \ Tokenizer.cc diff --git a/src/security/Context.h b/src/security/Context.h index 9daff9897f..b1a3a27f85 100644 --- a/src/security/Context.h +++ b/src/security/Context.h @@ -25,7 +25,7 @@ namespace Security { /* IMPORTANT: - * Due to circular dependency issues between ssl/libsquidssl.la and + * Due to circular dependency issues between ssl/libsslsquid.la and * security/libsecurity.la the code within src/ssl/ is restricted to * only using Security::ContextPtr, it MUST NOT use ContextPointer *