[packages/w3c-libwww.git] / w3c-libwww-link.patch

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

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