]>
Commit | Line | Data |
---|---|---|
6216cfe4 JB |
1 | Add inter-library linking. |
2 | HTBind.* moved from libwwwfile to libwwwdir in order to break circular dependencies. | |
3 | ||
28a51450 JR |
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 = \ | |
f3d484d1 AM |
8 | libwwwutils.la \ |
9 | libwwwcore.la \ | |
10 | libwwwtrans.la \ | |
11 | - libwwwstream.la \ | |
12 | - libwwwcache.la \ | |
13 | + libwwwhtml.la \ | |
14 | libwwwdir.la \ | |
f3d484d1 | 15 | + libwwwstream.la \ |
6216cfe4 | 16 | libwwwfile.la \ |
f3d484d1 AM |
17 | + libwwwcache.la \ |
18 | libwwwftp.la \ | |
19 | libwwwgopher.la \ | |
20 | libwwwmime.la \ | |
21 | libwwwhttp.la \ | |
22 | libwwwnews.la \ | |
23 | libwwwtelnet.la \ | |
24 | - libwwwhtml.la \ | |
6216cfe4 JB |
25 | + @WWWXML@ \ |
26 | + @WWWZIP@ \ | |
27 | libwwwapp.la \ | |
28 | libwwwinit.la \ | |
f3d484d1 AM |
29 | libwwwmux.la \ |
30 | @WWWDAV@ \ | |
6216cfe4 JB |
31 | - @WWWXML@ \ |
32 | - @WWWZIP@ \ | |
f3d484d1 AM |
33 | @WWWWAIS@ \ |
34 | @WWWSQL@ | |
35 | ||
28a51450 | 36 | @@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = \ |
f3d484d1 AM |
37 | libwwwdav.la \ |
38 | libwwwsql.la | |
39 | ||
40 | -SUBDIRS = SSL windows vms | |
41 | +SUBDIRS = . SSL windows vms | |
42 | ||
43 | # .h files are distributed but originally are made from the | |
44 | # self-documenting hypertext files. | |
28a51450 | 45 | @@ -144,6 +144,8 @@ libwwwcore_la_SOURCES = \ |
f3d484d1 AM |
46 | HTWWWStr.h \ |
47 | HTWWWStr.c | |
48 | ||
6216cfe4 | 49 | +libwwwcore_la_LIBADD = libwwwutils.la |
f3d484d1 AM |
50 | + |
51 | libwwwtrans_la_SOURCES = \ | |
52 | WWWTrans.h \ | |
53 | HTANSI.h \ | |
28a51450 | 54 | @@ -159,6 +161,8 @@ libwwwtrans_la_SOURCES = \ |
f3d484d1 AM |
55 | HTWriter.h \ |
56 | HTWriter.c | |
57 | ||
58 | +libwwwtrans_la_LIBADD = libwwwutils.la libwwwcore.la | |
59 | + | |
60 | libwwwstream_la_SOURCES = \ | |
61 | WWWStream.h \ | |
62 | HTConLen.h \ | |
28a51450 | 63 | @@ -182,22 +186,26 @@ libwwwstream_la_SOURCES = \ |
f3d484d1 AM |
64 | HTXParse.h \ |
65 | HTXParse.c | |
66 | ||
6216cfe4 | 67 | +libwwwstream_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
68 | + |
69 | libwwwcache_la_SOURCES = \ | |
70 | WWWCache.h \ | |
71 | HTCache.h \ | |
72 | HTCache.c | |
73 | ||
6216cfe4 | 74 | +libwwwcache_la_LIBADD = libwwwfile.la libwwwtrans.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
75 | + |
76 | libwwwfile_la_SOURCES = \ | |
77 | WWWFile.h \ | |
78 | HTBInit.h \ | |
6216cfe4 JB |
79 | HTBInit.c \ |
80 | - HTBind.h \ | |
81 | - HTBind.c \ | |
82 | HTFile.h \ | |
83 | HTFile.c \ | |
f3d484d1 AM |
84 | HTMulti.h \ |
85 | HTMulti.c | |
86 | ||
6216cfe4 | 87 | +libwwwfile_la_LIBADD = libwwwdir.la libwwwtrans.la libwwwhtml.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
88 | + |
89 | libwwwftp_la_SOURCES = \ | |
90 | WWWFTP.h \ | |
91 | HTFTP.h \ | |
28a51450 | 92 | @@ -205,11 +213,15 @@ libwwwftp_la_SOURCES = \ |
f3d484d1 AM |
93 | HTFTPDir.h \ |
94 | HTFTPDir.c | |
95 | ||
6216cfe4 | 96 | +libwwwftp_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
97 | + |
98 | libwwwgopher_la_SOURCES = \ | |
99 | WWWGophe.h \ | |
100 | HTGopher.h \ | |
101 | HTGopher.c | |
102 | ||
6216cfe4 | 103 | +libwwwgopher_la_LIBADD = libwwwhtml.la libwwwdir.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
104 | + |
105 | libwwwmime_la_SOURCES = \ | |
106 | WWWMIME.h \ | |
107 | HTBound.h \ | |
28a51450 | 108 | @@ -226,6 +238,8 @@ libwwwmime_la_SOURCES = \ |
f3d484d1 AM |
109 | HTMIMImp.c \ |
110 | HTMulpar.h | |
111 | ||
6216cfe4 | 112 | +libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
113 | + |
114 | libwwwhttp_la_SOURCES = \ | |
115 | WWWHTTP.h \ | |
116 | HTTPUtil.h \ | |
28a51450 | 117 | @@ -252,7 +266,7 @@ libwwwhttp_la_SOURCES = \ |
6216cfe4 JB |
118 | HTPEP.h \ |
119 | HTPEP.c | |
120 | ||
121 | -libwwwhttp_la_DEPENDENCIES = \ | |
122 | +libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \ | |
123 | ../../modules/md5/libmd5.la | |
124 | ||
125 | libwwwhttp_la_CPPFLAGS = \ | |
28a51450 | 126 | @@ -270,11 +284,15 @@ libwwwnews_la_SOURCES = \ |
f3d484d1 AM |
127 | HTNewsRq.h \ |
128 | HTNewsRq.c | |
129 | ||
6216cfe4 | 130 | +libwwwnews_la_LIBADD = libwwwmime.la libwwwstream.la libwwwhtml.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
131 | + |
132 | libwwwtelnet_la_SOURCES = \ | |
133 | WWWTelnt.h \ | |
134 | HTTelnet.h \ | |
135 | HTTelnet.c | |
136 | ||
6216cfe4 | 137 | +libwwwtelnet_la_LIBADD = libwwwcore.la libwwwutils.la |
f3d484d1 AM |
138 | + |
139 | libwwwwais_la_SOURCES = \ | |
140 | WWWWAIS.h \ | |
141 | HTWAIS.h \ | |
28a51450 | 142 | @@ -283,6 +301,7 @@ libwwwwais_la_SOURCES = \ |
6216cfe4 JB |
143 | HTWSRC.c |
144 | ||
145 | libwwwwais_la_LDFLAGS = -rpath $(libdir) | |
146 | +libwwwwais_la_LIBADD = | |
147 | ||
148 | libwwwhtml_la_SOURCES = \ | |
149 | WWWHTML.h \ | |
28a51450 | 150 | @@ -306,15 +325,21 @@ libwwwhtml_la_SOURCES = \ |
f3d484d1 AM |
151 | HTStyle.h \ |
152 | HTStyle.c | |
153 | ||
6216cfe4 | 154 | +libwwwhtml_la_LIBADD = libwwwcore.la libwwwutils.la |
f3d484d1 AM |
155 | + |
156 | libwwwdir_la_SOURCES = \ | |
157 | WWWDir.h \ | |
158 | HTIcons.h \ | |
6216cfe4 JB |
159 | HTIcons.c \ |
160 | HTDescpt.h \ | |
161 | HTDescpt.c \ | |
162 | + HTBind.h \ | |
163 | + HTBind.c \ | |
f3d484d1 AM |
164 | HTDir.h \ |
165 | HTDir.c | |
166 | ||
6216cfe4 | 167 | +libwwwdir_la_LIBADD = libwwwhtml.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
168 | + |
169 | libwwwapp_la_SOURCES = \ | |
170 | WWWApp.h \ | |
171 | HTAccess.h \ | |
28a51450 | 172 | @@ -338,11 +363,20 @@ libwwwapp_la_SOURCES = \ |
f3d484d1 AM |
173 | HTRules.h \ |
174 | HTRules.c | |
175 | ||
176 | +libwwwapp_la_LIBADD = \ | |
6216cfe4 JB |
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 | |
f3d484d1 AM |
181 | + |
182 | libwwwinit_la_SOURCES = \ | |
183 | WWWInit.h \ | |
184 | HTProfil.h \ | |
185 | HTProfil.c | |
186 | ||
187 | +libwwwinit_la_LIBADD = \ | |
6216cfe4 | 188 | + libwwwapp.la libwwwhtml.la libwwwcache.la libwwwdir.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
189 | + |
190 | libwwwmux_la_SOURCES = \ | |
191 | WWWMux.h \ | |
192 | HTDemux.h \ | |
28a51450 | 193 | @@ -353,11 +387,14 @@ libwwwmux_la_SOURCES = \ |
f3d484d1 AM |
194 | HTMuxTx.h \ |
195 | HTMuxTx.c | |
196 | ||
6216cfe4 | 197 | +libwwwmux_la_LIBADD = libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la |
f3d484d1 AM |
198 | + |
199 | libwwwdav_la_SOURCES = \ | |
200 | HTDAV.h \ | |
201 | HTDAV.c | |
0ea52cb0 JB |
202 | |
203 | libwwwdav_la_LDFLAGS = -rpath $(libdir) | |
6216cfe4 | 204 | +libwwwdav_la_LIBADD = libwwwapp.la libwwwcore.la libwwwutils.la |
0ea52cb0 | 205 | |
0ea52cb0 JB |
206 | libwwwxml_la_SOURCES = \ |
207 | WWWXML.h \ | |
28a51450 | 208 | @@ -366,9 +403,8 @@ libwwwxml_la_SOURCES = \ |
6216cfe4 JB |
209 | HTXML.h \ |
210 | HTXML.c | |
f3d484d1 | 211 | |
6216cfe4 JB |
212 | -libwwwxml_la_DEPENDENCIES = |
213 | - | |
214 | libwwwxml_la_LDFLAGS = -rpath $(libdir) $(EXPAT_LIBS) | |
215 | +libwwwxml_la_LIBADD = libwwwcore.la libwwwutils.la -lexpat | |
f3d484d1 AM |
216 | |
217 | libwwwzip_la_SOURCES = \ | |
218 | WWWZip.h \ | |
28a51450 | 219 | @@ -377,6 +413,7 @@ libwwwzip_la_SOURCES = \ |
f3d484d1 AM |
220 | HTZip.c |
221 | ||
f3d484d1 | 222 | libwwwzip_la_LDFLAGS = -rpath $(libdir) |
6216cfe4 | 223 | +libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la |
f3d484d1 AM |
224 | |
225 | libwwwsql_la_SOURCES = \ | |
6216cfe4 | 226 | WWWSQL.h \ |
28a51450 | 227 | @@ -386,7 +423,8 @@ libwwwsql_la_SOURCES = \ |
6216cfe4 JB |
228 | HTSQLLog.h \ |
229 | HTSQLLog.c | |
230 | ||
231 | -libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS) | |
232 | +libwwwsql_la_LDFLAGS = -rpath $(libdir) | |
233 | +libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS) | |
234 | ||
235 | libwwwsql_la_CPPFLAGS = \ | |
236 | -I/usr/local/include \ | |
28a51450 JR |
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 = \ | |
23b91159 | 241 | HTSSLhttps.c |
242 | ||
6216cfe4 JB |
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 | |
23b91159 | 247 | |
248 | LDADD = \ | |
249 | libwwwssl.la | |
28a51450 JR |
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 = \ | |
23b91159 | 254 | CSMacRed.c CSMem.c CSApp.c \ |
255 | CSParse.c CSUsrLst.c CSUser.c | |
256 | ||
257 | +libpics_la_LIBADD = \ | |
6216cfe4 JB |
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 | |
23b91159 | 260 | + |
261 | BUILT_SOURCES = \ | |
262 | CSLApp.h CSLUtils.h \ | |
263 | CSLL.h CSLLSt.h \ |