]>
Commit | Line | Data |
---|---|---|
23b91159 | 1 | --- w3c-libwww-5.4.0/Library/src/Makefile.am.orig 2010-11-09 16:19:08.655724837 +0100 |
2 | +++ w3c-libwww-5.4.0/Library/src/Makefile.am 2010-11-09 16:35:05.816043461 +0100 | |
f3d484d1 AM |
3 | @@ -6,23 +6,23 @@ |
4 | libwwwutils.la \ | |
5 | libwwwcore.la \ | |
6 | libwwwtrans.la \ | |
7 | - libwwwstream.la \ | |
8 | - libwwwcache.la \ | |
9 | + libwwwhtml.la \ | |
10 | libwwwdir.la \ | |
11 | libwwwfile.la \ | |
12 | + libwwwstream.la \ | |
13 | + libwwwcache.la \ | |
14 | libwwwftp.la \ | |
15 | libwwwgopher.la \ | |
16 | libwwwmime.la \ | |
17 | libwwwhttp.la \ | |
18 | libwwwnews.la \ | |
19 | libwwwtelnet.la \ | |
20 | - libwwwhtml.la \ | |
21 | - libwwwapp.la \ | |
22 | - libwwwinit.la \ | |
23 | libwwwmux.la \ | |
24 | @WWWDAV@ \ | |
25 | @WWWXML@ \ | |
26 | @WWWZIP@ \ | |
27 | + libwwwapp.la \ | |
28 | + libwwwinit.la \ | |
29 | @WWWWAIS@ \ | |
30 | @WWWSQL@ | |
31 | ||
32 | @@ -33,7 +33,7 @@ | |
33 | libwwwdav.la \ | |
34 | libwwwsql.la | |
35 | ||
36 | -SUBDIRS = SSL windows vms | |
37 | +SUBDIRS = . SSL windows vms | |
38 | ||
39 | # .h files are distributed but originally are made from the | |
40 | # self-documenting hypertext files. | |
41 | @@ -143,6 +143,9 @@ | |
42 | HTWWWStr.h \ | |
43 | HTWWWStr.c | |
44 | ||
45 | +libwwwcore_la_LIBADD = \ | |
46 | + libwwwutils.la | |
47 | + | |
48 | libwwwtrans_la_SOURCES = \ | |
49 | WWWTrans.h \ | |
50 | HTANSI.h \ | |
51 | @@ -158,6 +161,8 @@ | |
52 | HTWriter.h \ | |
53 | HTWriter.c | |
54 | ||
55 | +libwwwtrans_la_LIBADD = libwwwutils.la libwwwcore.la | |
56 | + | |
57 | libwwwstream_la_SOURCES = \ | |
58 | WWWStream.h \ | |
59 | HTConLen.h \ | |
60 | @@ -181,11 +186,15 @@ | |
61 | HTXParse.h \ | |
62 | HTXParse.c | |
63 | ||
64 | +libwwwstream_la_LIBADD = libwwwfile.la libwwwutils.la libwwwcore.la | |
65 | + | |
66 | libwwwcache_la_SOURCES = \ | |
67 | WWWCache.h \ | |
68 | HTCache.h \ | |
69 | HTCache.c | |
70 | ||
71 | +libwwwcache_la_LIBADD = libwwwutils.la libwwwcore.la libwwwtrans.la | |
72 | + | |
73 | libwwwfile_la_SOURCES = \ | |
74 | WWWFile.h \ | |
75 | HTBInit.h \ | |
76 | @@ -197,6 +206,8 @@ | |
77 | HTMulti.h \ | |
78 | HTMulti.c | |
79 | ||
80 | +libwwwfile_la_LIBADD = libwwwtrans.la libwwwdir.la libwwwutils.la libwwwcore.la | |
81 | + | |
82 | libwwwftp_la_SOURCES = \ | |
83 | WWWFTP.h \ | |
84 | HTFTP.h \ | |
85 | @@ -204,11 +215,15 @@ | |
86 | HTFTPDir.h \ | |
87 | HTFTPDir.c | |
88 | ||
89 | +libwwwftp_la_LIBADD = libwwwutils.la libwwwcore.la libwwwdir.la libwwwfile.la | |
90 | + | |
91 | libwwwgopher_la_SOURCES = \ | |
92 | WWWGophe.h \ | |
93 | HTGopher.h \ | |
94 | HTGopher.c | |
95 | ||
96 | +libwwwgopher_la_LIBADD = libwwwutils.la libwwwcore.la libwwwhtml.la libwwwdir.la | |
97 | + | |
98 | libwwwmime_la_SOURCES = \ | |
99 | WWWMIME.h \ | |
100 | HTBound.h \ | |
101 | @@ -225,6 +240,8 @@ | |
102 | HTMIMImp.c \ | |
103 | HTMulpar.h | |
104 | ||
105 | +libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwutils.la libwwwcore.la | |
106 | + | |
107 | libwwwhttp_la_SOURCES = \ | |
108 | WWWHTTP.h \ | |
109 | HTTPUtil.h \ | |
f3d484d1 AM |
110 | @@ -265,11 +285,15 @@ |
111 | HTNewsRq.h \ | |
112 | HTNewsRq.c | |
113 | ||
114 | +libwwwnews_la_LIBADD = libwwwstream.la libwwwutils.la libwwwcore.la libwwwmime.la | |
115 | + | |
116 | libwwwtelnet_la_SOURCES = \ | |
117 | WWWTelnt.h \ | |
118 | HTTelnet.h \ | |
119 | HTTelnet.c | |
120 | ||
121 | +libwwwtelnet_la_LIBADD = libwwwutils.la libwwwcore.la | |
122 | + | |
123 | libwwwwais_la_SOURCES = \ | |
124 | WWWWAIS.h \ | |
125 | HTWAIS.h \ | |
126 | @@ -301,6 +325,8 @@ | |
127 | HTStyle.h \ | |
128 | HTStyle.c | |
129 | ||
130 | +libwwwhtml_la_LIBADD = libwwwutils.la libwwwcore.la | |
131 | + | |
132 | libwwwdir_la_SOURCES = \ | |
133 | WWWDir.h \ | |
134 | HTIcons.h \ | |
135 | @@ -310,6 +336,9 @@ | |
136 | HTDir.h \ | |
137 | HTDir.c | |
138 | ||
139 | +libwwwdir_la_LIBADD = \ | |
23b91159 | 140 | + libwwwhtml.la libwwwutils.la libwwwcore.la HTBind.lo |
f3d484d1 AM |
141 | + |
142 | libwwwapp_la_SOURCES = \ | |
143 | WWWApp.h \ | |
144 | HTAccess.h \ | |
145 | @@ -333,11 +362,18 @@ | |
146 | HTRules.h \ | |
147 | HTRules.c | |
148 | ||
149 | +libwwwapp_la_LIBADD = \ | |
150 | + libwwwmime.la libwwwdir.la libwwwhttp.la libwwwnews.la libwwwftp.la libwwwxml.la libwwwzip.la \ | |
151 | + libwwwgopher.la libwwwtelnet.la libwwwstream.la | |
152 | + | |
153 | libwwwinit_la_SOURCES = \ | |
154 | WWWInit.h \ | |
155 | HTProfil.h \ | |
156 | HTProfil.c | |
157 | ||
158 | +libwwwinit_la_LIBADD = \ | |
159 | + libwwwfile.la libwwwhtml.la libwwwapp.la | |
160 | + | |
161 | libwwwmux_la_SOURCES = \ | |
162 | WWWMux.h \ | |
163 | HTDemux.h \ | |
0ea52cb0 | 164 | @@ -348,12 +384,16 @@ |
f3d484d1 AM |
165 | HTMuxTx.h \ |
166 | HTMuxTx.c | |
167 | ||
168 | +libwwwmux_la_LIBADD = libwwwutils.la libwwwstream.la libwwwcore.la | |
169 | + | |
170 | libwwwdav_la_SOURCES = \ | |
171 | HTDAV.h \ | |
172 | HTDAV.c | |
0ea52cb0 JB |
173 | |
174 | libwwwdav_la_LDFLAGS = -rpath $(libdir) | |
175 | ||
176 | +libwwwdav_la_LIBADD = libwwwcore.la libwwwapp.la | |
177 | + | |
178 | libwwwxml_la_SOURCES = \ | |
179 | WWWXML.h \ | |
180 | HTRDF.h \ | |
181 | @@ -363,7 +403,7 @@ | |
f3d484d1 AM |
182 | |
183 | libwwwxml_la_LDFLAGS = -rpath $(libdir) | |
184 | ||
185 | -libwwwxml_la_LIBADD = -lexpat | |
186 | +libwwwxml_la_LIBADD = -lexpat libwwwcore.la | |
187 | ||
188 | libwwwzip_la_SOURCES = \ | |
189 | WWWZip.h \ | |
0ea52cb0 | 190 | @@ -371,6 +411,8 @@ |
f3d484d1 AM |
191 | HTZip.h \ |
192 | HTZip.c | |
193 | ||
194 | +libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la | |
195 | + | |
196 | libwwwzip_la_LDFLAGS = -rpath $(libdir) | |
197 | ||
198 | libwwwsql_la_SOURCES = \ | |
23b91159 | 199 | --- w3c-libwww-5.4.0/Library/src/SSL/Makefile.am.orig 2010-11-09 16:38:48.992046302 +0100 |
200 | +++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am 2010-11-09 16:44:35.662364395 +0100 | |
201 | @@ -39,7 +39,8 @@ | |
202 | HTSSLhttps.h \ | |
203 | HTSSLhttps.c | |
204 | ||
205 | -libwwwssl_la_LDFLAGS = -rpath $(libdir) | |
206 | +libwwwssl_la_LDFLAGS = -rpath $(libdir) \ | |
207 | + ../libwwwcore.la ../libwwwapp.la ../libwwwhttp.la | |
208 | ||
209 | LDADD = \ | |
210 | libwwwssl.la | |
211 | --- w3c-libwww-5.4.0/PICS-client/src/Makefile.am.orig 2010-11-09 16:45:44.105885672 +0100 | |
212 | +++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am 2010-11-09 16:47:56.818021370 +0100 | |
213 | @@ -30,6 +30,9 @@ | |
214 | CSMacRed.c CSMem.c CSApp.c \ | |
215 | CSParse.c CSUsrLst.c CSUser.c | |
216 | ||
217 | +libpics_la_LIBADD = \ | |
218 | + ../../Library/src/libwwwcore.la ../../Library/src/libwwwapp.la | |
219 | + | |
220 | BUILT_SOURCES = \ | |
221 | CSLApp.h CSLUtils.h \ | |
222 | CSLL.h CSLLSt.h \ |