1 Add inter-library linking.
2 HTBind.* moved from libwwwfile to libwwwdir in order to break circular dependencies.
4 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/Makefile.am w3c-libwww-5.4.2/Library/src/Makefile.am
5 --- w3c-libwww-5.4.2.org/Library/src/Makefile.am 2021-09-29 22:22:47.424976516 +0200
6 +++ w3c-libwww-5.4.2/Library/src/Makefile.am 2021-09-29 22:22:47.498309658 +0200
7 @@ -6,23 +6,23 @@ lib_LTLIBRARIES = \
36 @@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = \
40 -SUBDIRS = SSL windows vms
41 +SUBDIRS = . SSL windows vms
43 # .h files are distributed but originally are made from the
44 # self-documenting hypertext files.
45 @@ -144,6 +144,8 @@ libwwwcore_la_SOURCES = \
49 +libwwwcore_la_LIBADD = libwwwutils.la
51 libwwwtrans_la_SOURCES = \
54 @@ -159,6 +161,8 @@ libwwwtrans_la_SOURCES = \
58 +libwwwtrans_la_LIBADD = libwwwutils.la libwwwcore.la
60 libwwwstream_la_SOURCES = \
63 @@ -182,22 +186,26 @@ libwwwstream_la_SOURCES = \
67 +libwwwstream_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
69 libwwwcache_la_SOURCES = \
74 +libwwwcache_la_LIBADD = libwwwfile.la libwwwtrans.la libwwwcore.la libwwwutils.la
76 libwwwfile_la_SOURCES = \
87 +libwwwfile_la_LIBADD = libwwwdir.la libwwwtrans.la libwwwhtml.la libwwwcore.la libwwwutils.la
89 libwwwftp_la_SOURCES = \
92 @@ -205,11 +213,15 @@ libwwwftp_la_SOURCES = \
96 +libwwwftp_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
98 libwwwgopher_la_SOURCES = \
103 +libwwwgopher_la_LIBADD = libwwwhtml.la libwwwdir.la libwwwcore.la libwwwutils.la
105 libwwwmime_la_SOURCES = \
108 @@ -226,6 +238,8 @@ libwwwmime_la_SOURCES = \
112 +libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwcore.la libwwwutils.la
114 libwwwhttp_la_SOURCES = \
117 @@ -252,7 +266,7 @@ libwwwhttp_la_SOURCES = \
121 -libwwwhttp_la_DEPENDENCIES = \
122 +libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \
123 ../../modules/md5/libmd5.la
125 libwwwhttp_la_CPPFLAGS = \
126 @@ -270,11 +284,15 @@ libwwwnews_la_SOURCES = \
130 +libwwwnews_la_LIBADD = libwwwmime.la libwwwstream.la libwwwhtml.la libwwwcore.la libwwwutils.la
132 libwwwtelnet_la_SOURCES = \
137 +libwwwtelnet_la_LIBADD = libwwwcore.la libwwwutils.la
139 libwwwwais_la_SOURCES = \
142 @@ -283,6 +301,7 @@ libwwwwais_la_SOURCES = \
145 libwwwwais_la_LDFLAGS = -rpath $(libdir)
146 +libwwwwais_la_LIBADD =
148 libwwwhtml_la_SOURCES = \
150 @@ -306,15 +325,21 @@ libwwwhtml_la_SOURCES = \
154 +libwwwhtml_la_LIBADD = libwwwcore.la libwwwutils.la
156 libwwwdir_la_SOURCES = \
167 +libwwwdir_la_LIBADD = libwwwhtml.la libwwwcore.la libwwwutils.la
169 libwwwapp_la_SOURCES = \
172 @@ -338,11 +363,20 @@ libwwwapp_la_SOURCES = \
176 +libwwwapp_la_LIBADD = \
177 + libwwwftp.la libwwwgopher.la libwwwhttp.la libwwwnews.la libwwwtelnet.la \
178 + libwwwcache.la libwwwfile.la libwwwdir.la \
179 + libwwwhtml.la libwwwxml.la libwwwzip.la libwwwmime.la \
180 + libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
182 libwwwinit_la_SOURCES = \
187 +libwwwinit_la_LIBADD = \
188 + libwwwapp.la libwwwhtml.la libwwwcache.la libwwwdir.la libwwwcore.la libwwwutils.la
190 libwwwmux_la_SOURCES = \
193 @@ -353,11 +387,14 @@ libwwwmux_la_SOURCES = \
197 +libwwwmux_la_LIBADD = libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
199 libwwwdav_la_SOURCES = \
203 libwwwdav_la_LDFLAGS = -rpath $(libdir)
204 +libwwwdav_la_LIBADD = libwwwapp.la libwwwcore.la libwwwutils.la
206 libwwwxml_la_SOURCES = \
208 @@ -366,9 +403,8 @@ libwwwxml_la_SOURCES = \
212 -libwwwxml_la_DEPENDENCIES =
214 libwwwxml_la_LDFLAGS = -rpath $(libdir) $(EXPAT_LIBS)
215 +libwwwxml_la_LIBADD = libwwwcore.la libwwwutils.la -lexpat
217 libwwwzip_la_SOURCES = \
219 @@ -377,6 +413,7 @@ libwwwzip_la_SOURCES = \
222 libwwwzip_la_LDFLAGS = -rpath $(libdir)
223 +libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la
225 libwwwsql_la_SOURCES = \
227 @@ -386,7 +423,8 @@ libwwwsql_la_SOURCES = \
231 -libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS)
232 +libwwwsql_la_LDFLAGS = -rpath $(libdir)
233 +libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS)
235 libwwwsql_la_CPPFLAGS = \
236 -I/usr/local/include \
237 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
238 --- w3c-libwww-5.4.2.org/Library/src/SSL/Makefile.am 2017-06-24 07:51:38.000000000 +0200
239 +++ w3c-libwww-5.4.2/Library/src/SSL/Makefile.am 2021-09-29 22:22:47.498309658 +0200
240 @@ -40,6 +40,9 @@ libwwwssl_la_SOURCES = \
243 libwwwssl_la_LDFLAGS = -rpath $(libdir)
244 +libwwwssl_la_LIBADD = \
245 + $(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
246 + $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
250 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
251 --- w3c-libwww-5.4.2.org/PICS-client/src/Makefile.am 2017-06-24 07:51:38.000000000 +0200
252 +++ w3c-libwww-5.4.2/PICS-client/src/Makefile.am 2021-09-29 22:22:47.498309658 +0200
253 @@ -30,6 +30,10 @@ libpics_la_SOURCES = \
254 CSMacRed.c CSMem.c CSApp.c \
255 CSParse.c CSUsrLst.c CSUser.c
257 +libpics_la_LIBADD = \
258 + $(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
259 + $(top_builddir)/Library/src/libwwwdir.la $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
262 CSLApp.h CSLUtils.h \