Add inter-library linking.
HTBind.* moved from libwwwfile to libwwwdir in order to break circular dependencies.

diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/Makefile.am w3c-libwww-5.4.2/Library/src/Makefile.am
--- w3c-libwww-5.4.2.org/Library/src/Makefile.am	2021-09-29 22:22:47.424976516 +0200
+++ w3c-libwww-5.4.2/Library/src/Makefile.am	2021-09-29 22:22:47.498309658 +0200
@@ -6,23 +6,23 @@ lib_LTLIBRARIES = \
 	libwwwutils.la \
 	libwwwcore.la \
 	libwwwtrans.la \
-	libwwwstream.la \
-	libwwwcache.la \
+	libwwwhtml.la \
 	libwwwdir.la \
+	libwwwstream.la \
 	libwwwfile.la \
+	libwwwcache.la \
 	libwwwftp.la \
 	libwwwgopher.la \
 	libwwwmime.la \
 	libwwwhttp.la \
 	libwwwnews.la \
 	libwwwtelnet.la \
-	libwwwhtml.la \
+	@WWWXML@ \
+	@WWWZIP@ \
 	libwwwapp.la \
 	libwwwinit.la \
 	libwwwmux.la \
         @WWWDAV@ \
-	@WWWXML@ \
-	@WWWZIP@ \
 	@WWWWAIS@ \
 	@WWWSQL@
 
@@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = \
         libwwwdav.la \
 	libwwwsql.la
 
-SUBDIRS = SSL windows vms
+SUBDIRS = . SSL windows vms
 
 #	.h files are distributed but originally are made from the
 #	self-documenting hypertext files.
@@ -144,6 +144,8 @@ libwwwcore_la_SOURCES = \
 	HTWWWStr.h \
 	HTWWWStr.c
 
+libwwwcore_la_LIBADD = libwwwutils.la
+
 libwwwtrans_la_SOURCES = \
 	WWWTrans.h \
 	HTANSI.h \
@@ -159,6 +161,8 @@ libwwwtrans_la_SOURCES = \
 	HTWriter.h \
 	HTWriter.c
 
+libwwwtrans_la_LIBADD = libwwwutils.la libwwwcore.la
+
 libwwwstream_la_SOURCES = \
 	WWWStream.h \
 	HTConLen.h \
@@ -182,22 +186,26 @@ libwwwstream_la_SOURCES = \
 	HTXParse.h \
 	HTXParse.c
 
+libwwwstream_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
+
 libwwwcache_la_SOURCES = \
 	WWWCache.h \
 	HTCache.h \
 	HTCache.c
 
+libwwwcache_la_LIBADD = libwwwfile.la libwwwtrans.la libwwwcore.la libwwwutils.la
+
 libwwwfile_la_SOURCES = \
 	WWWFile.h \
 	HTBInit.h \
 	HTBInit.c \
-	HTBind.h \
-	HTBind.c \
 	HTFile.h \
 	HTFile.c \
 	HTMulti.h \
 	HTMulti.c
 
+libwwwfile_la_LIBADD = libwwwdir.la libwwwtrans.la libwwwhtml.la libwwwcore.la libwwwutils.la
+
 libwwwftp_la_SOURCES = \
 	WWWFTP.h \
 	HTFTP.h \
@@ -205,11 +213,15 @@ libwwwftp_la_SOURCES = \
 	HTFTPDir.h \
 	HTFTPDir.c
 
+libwwwftp_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
+
 libwwwgopher_la_SOURCES = \
 	WWWGophe.h \
 	HTGopher.h \
 	HTGopher.c
 
+libwwwgopher_la_LIBADD = libwwwhtml.la libwwwdir.la libwwwcore.la libwwwutils.la
+
 libwwwmime_la_SOURCES = \
 	WWWMIME.h \
 	HTBound.h \
@@ -226,6 +238,8 @@ libwwwmime_la_SOURCES = \
 	HTMIMImp.c \
 	HTMulpar.h
 
+libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwcore.la libwwwutils.la
+
 libwwwhttp_la_SOURCES = \
 	WWWHTTP.h \
 	HTTPUtil.h \
@@ -252,7 +266,7 @@ libwwwhttp_la_SOURCES = \
 	HTPEP.h \
 	HTPEP.c
 
-libwwwhttp_la_DEPENDENCIES = \
+libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \
 	../../modules/md5/libmd5.la
 
 libwwwhttp_la_CPPFLAGS = \
@@ -270,11 +284,15 @@ libwwwnews_la_SOURCES = \
 	HTNewsRq.h \
 	HTNewsRq.c
 
+libwwwnews_la_LIBADD = libwwwmime.la libwwwstream.la libwwwhtml.la libwwwcore.la libwwwutils.la
+
 libwwwtelnet_la_SOURCES = \
 	WWWTelnt.h \
 	HTTelnet.h \
 	HTTelnet.c
 
+libwwwtelnet_la_LIBADD = libwwwcore.la libwwwutils.la
+
 libwwwwais_la_SOURCES = \
 	WWWWAIS.h \
 	HTWAIS.h \
@@ -283,6 +301,7 @@ libwwwwais_la_SOURCES = \
 	HTWSRC.c
 
 libwwwwais_la_LDFLAGS = -rpath $(libdir)
+libwwwwais_la_LIBADD = 
 
 libwwwhtml_la_SOURCES = \
 	WWWHTML.h \
@@ -306,15 +325,21 @@ libwwwhtml_la_SOURCES = \
 	HTStyle.h \
 	HTStyle.c
 
+libwwwhtml_la_LIBADD = libwwwcore.la libwwwutils.la
+
 libwwwdir_la_SOURCES = \
 	WWWDir.h \
 	HTIcons.h \
 	HTIcons.c \
 	HTDescpt.h \
 	HTDescpt.c \
+	HTBind.h \
+	HTBind.c \
 	HTDir.h \
 	HTDir.c
 
+libwwwdir_la_LIBADD = libwwwhtml.la libwwwcore.la libwwwutils.la
+
 libwwwapp_la_SOURCES = \
 	WWWApp.h \
 	HTAccess.h \
@@ -338,11 +363,20 @@ libwwwapp_la_SOURCES = \
 	HTRules.h \
 	HTRules.c
 
+libwwwapp_la_LIBADD = \
+	libwwwftp.la libwwwgopher.la libwwwhttp.la libwwwnews.la libwwwtelnet.la \
+	libwwwcache.la libwwwfile.la libwwwdir.la \
+	libwwwhtml.la libwwwxml.la libwwwzip.la libwwwmime.la \
+	libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
+
 libwwwinit_la_SOURCES = \
 	WWWInit.h \
 	HTProfil.h \
 	HTProfil.c
 
+libwwwinit_la_LIBADD = \
+	libwwwapp.la libwwwhtml.la libwwwcache.la libwwwdir.la libwwwcore.la libwwwutils.la
+
 libwwwmux_la_SOURCES = \
 	WWWMux.h \
 	HTDemux.h \
@@ -353,11 +387,14 @@ libwwwmux_la_SOURCES = \
 	HTMuxTx.h \
 	HTMuxTx.c
 
+libwwwmux_la_LIBADD = libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
+
 libwwwdav_la_SOURCES = \
         HTDAV.h \
         HTDAV.c
 
 libwwwdav_la_LDFLAGS = -rpath $(libdir)
+libwwwdav_la_LIBADD = libwwwapp.la libwwwcore.la libwwwutils.la
 
 libwwwxml_la_SOURCES = \
 	WWWXML.h \
@@ -366,9 +403,8 @@ libwwwxml_la_SOURCES = \
 	HTXML.h \
 	HTXML.c
 
-libwwwxml_la_DEPENDENCIES =
-
 libwwwxml_la_LDFLAGS = -rpath $(libdir) $(EXPAT_LIBS)
+libwwwxml_la_LIBADD = libwwwcore.la libwwwutils.la -lexpat
 
 libwwwzip_la_SOURCES = \
 	WWWZip.h \
@@ -377,6 +413,7 @@ libwwwzip_la_SOURCES = \
 	HTZip.c
 
 libwwwzip_la_LDFLAGS = -rpath $(libdir)
+libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la
 
 libwwwsql_la_SOURCES = \
 	WWWSQL.h \
@@ -386,7 +423,8 @@ libwwwsql_la_SOURCES = \
 	HTSQLLog.h \
 	HTSQLLog.c
 
-libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS)
+libwwwsql_la_LDFLAGS = -rpath $(libdir)
+libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS)
 
 libwwwsql_la_CPPFLAGS = \
 	-I/usr/local/include \
diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/SSL/Makefile.am w3c-libwww-5.4.2/Library/src/SSL/Makefile.am
--- w3c-libwww-5.4.2.org/Library/src/SSL/Makefile.am	2017-06-24 07:51:38.000000000 +0200
+++ w3c-libwww-5.4.2/Library/src/SSL/Makefile.am	2021-09-29 22:22:47.498309658 +0200
@@ -40,6 +40,9 @@ libwwwssl_la_SOURCES = \
 	HTSSLhttps.c
 
 libwwwssl_la_LDFLAGS = -rpath $(libdir)
+libwwwssl_la_LIBADD = \
+	$(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
+	$(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
 
 LDADD = \
 	libwwwssl.la
diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/PICS-client/src/Makefile.am w3c-libwww-5.4.2/PICS-client/src/Makefile.am
--- w3c-libwww-5.4.2.org/PICS-client/src/Makefile.am	2017-06-24 07:51:38.000000000 +0200
+++ w3c-libwww-5.4.2/PICS-client/src/Makefile.am	2021-09-29 22:22:47.498309658 +0200
@@ -30,6 +30,10 @@ libpics_la_SOURCES = \
 	CSMacRed.c	CSMem.c		CSApp.c \
 	CSParse.c	CSUsrLst.c	CSUser.c
 
+libpics_la_LIBADD = \
+	$(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
+	$(top_builddir)/Library/src/libwwwdir.la $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
+
 BUILT_SOURCES = \
 	CSLApp.h	CSLUtils.h \
 	CSLL.h		CSLLSt.h \