1 Add inter-library linking.
2 HTBind.* moved from libwwwfile to libwwwdir in order to break circular dependencies.
4 --- w3c-libwww-5.4.2/Library/src/Makefile.am.orig 2018-02-17 23:07:29.681038241 +0100
5 +++ w3c-libwww-5.4.2/Library/src/Makefile.am 2018-02-17 23:08:36.487704147 +0100
39 -SUBDIRS = SSL windows vms
40 +SUBDIRS = . SSL windows vms
42 # .h files are distributed but originally are made from the
43 # self-documenting hypertext files.
48 +libwwwcore_la_LIBADD = libwwwutils.la
50 libwwwtrans_la_SOURCES = \
57 +libwwwtrans_la_LIBADD = libwwwutils.la libwwwcore.la
59 libwwwstream_la_SOURCES = \
66 +libwwwstream_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
68 libwwwcache_la_SOURCES = \
73 +libwwwcache_la_LIBADD = libwwwfile.la libwwwtrans.la libwwwcore.la libwwwutils.la
75 libwwwfile_la_SOURCES = \
86 +libwwwfile_la_LIBADD = libwwwdir.la libwwwtrans.la libwwwhtml.la libwwwcore.la libwwwutils.la
88 libwwwftp_la_SOURCES = \
95 +libwwwftp_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
97 libwwwgopher_la_SOURCES = \
102 +libwwwgopher_la_LIBADD = libwwwhtml.la libwwwdir.la libwwwcore.la libwwwutils.la
104 libwwwmime_la_SOURCES = \
111 +libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwcore.la libwwwutils.la
113 libwwwhttp_la_SOURCES = \
120 -libwwwhttp_la_DEPENDENCIES = \
121 +libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \
122 ../../modules/md5/libmd5.la
124 libwwwhttp_la_CPPFLAGS = \
125 @@ -270,11 +284,15 @@
129 +libwwwnews_la_LIBADD = libwwwmime.la libwwwstream.la libwwwhtml.la libwwwcore.la libwwwutils.la
131 libwwwtelnet_la_SOURCES = \
136 +libwwwtelnet_la_LIBADD = libwwwcore.la libwwwutils.la
138 libwwwwais_la_SOURCES = \
144 libwwwwais_la_LDFLAGS = -rpath $(libdir)
145 +libwwwwais_la_LIBADD =
147 libwwwhtml_la_SOURCES = \
149 @@ -306,15 +325,21 @@
153 +libwwwhtml_la_LIBADD = libwwwcore.la libwwwutils.la
155 libwwwdir_la_SOURCES = \
166 +libwwwdir_la_LIBADD = libwwwhtml.la libwwwcore.la libwwwutils.la
168 libwwwapp_la_SOURCES = \
171 @@ -338,11 +363,20 @@
175 +libwwwapp_la_LIBADD = \
176 + libwwwftp.la libwwwgopher.la libwwwhttp.la libwwwnews.la libwwwtelnet.la \
177 + libwwwcache.la libwwwfile.la libwwwdir.la \
178 + libwwwhtml.la libwwwxml.la libwwwzip.la libwwwmime.la \
179 + libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
181 libwwwinit_la_SOURCES = \
186 +libwwwinit_la_LIBADD = \
187 + libwwwapp.la libwwwhtml.la libwwwcache.la libwwwdir.la libwwwcore.la libwwwutils.la
189 libwwwmux_la_SOURCES = \
192 @@ -353,11 +387,14 @@
196 +libwwwmux_la_LIBADD = libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
198 libwwwdav_la_SOURCES = \
202 libwwwdav_la_LDFLAGS = -rpath $(libdir)
203 +libwwwdav_la_LIBADD = libwwwapp.la libwwwcore.la libwwwutils.la
205 libwwwxml_la_SOURCES = \
211 -libwwwxml_la_DEPENDENCIES =
213 libwwwxml_la_LDFLAGS = -rpath $(libdir) $(EXPAT_LIBS)
214 +libwwwxml_la_LIBADD = libwwwcore.la libwwwutils.la -lexpat
216 libwwwzip_la_SOURCES = \
221 libwwwzip_la_LDFLAGS = -rpath $(libdir)
222 +libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la
224 libwwwsql_la_SOURCES = \
230 -libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS)
231 +libwwwsql_la_LDFLAGS = -rpath $(libdir)
232 +libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS)
234 libwwwsql_la_CPPFLAGS = \
235 -I/usr/local/include \
236 --- w3c-libwww-5.4.2/Library/src/SSL/Makefile.am.orig 2017-06-24 07:51:38.000000000 +0200
237 +++ w3c-libwww-5.4.2/Library/src/SSL/Makefile.am 2018-02-18 11:29:09.440530134 +0100
242 libwwwssl_la_LDFLAGS = -rpath $(libdir)
243 +libwwwssl_la_LIBADD = \
244 + $(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
245 + $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
249 --- w3c-libwww-5.4.2/PICS-client/src/Makefile.am.orig 2017-06-24 07:51:38.000000000 +0200
250 +++ w3c-libwww-5.4.2/PICS-client/src/Makefile.am 2018-02-18 11:32:54.180527570 +0100
252 CSMacRed.c CSMem.c CSApp.c \
253 CSParse.c CSUsrLst.c CSUser.c
255 +libpics_la_LIBADD = \
256 + $(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
257 + $(top_builddir)/Library/src/libwwwdir.la $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
260 CSLApp.h CSLUtils.h \