SOURCES: cone-linking.patch (NEW) - fixed library linking

andree andree at pld-linux.org
Sat Jul 9 12:35:33 CEST 2005


Author: andree                       Date: Sat Jul  9 10:35:33 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed library linking

---- Files affected:
SOURCES:
   cone-linking.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/cone-linking.patch
diff -u /dev/null SOURCES/cone-linking.patch:1.1
--- /dev/null	Sat Jul  9 12:35:33 2005
+++ SOURCES/cone-linking.patch	Sat Jul  9 12:35:27 2005
@@ -0,0 +1,105 @@
+diff -Nur old/cone/Makefile.am new/cone/Makefile.am
+--- old/cone/Makefile.am	2005-06-19 16:25:13.000000000 +0000
++++ new/cone/Makefile.am	2005-07-09 09:42:20.734964440 +0000
+@@ -180,8 +180,7 @@
+ pwtest_SOURCES=pwtest.c
+ pwtest_DEPENDENCIES=../tcpd/libtlsclient.a libcouriertls.dep \
+ 	../md5/libmd5.la
+-pwtest_LDADD=../tcpd/libtlsclient.a `cat libcouriertls.dep` ../md5/libmd5.la
+-pwtest_LDFLAGS=-static
++pwtest_LDADD=../tcpd/libtlsclient.a `cat libcouriertls.dep` ../md5/.libs/libmd5.a
+ 
+ libcouriertls.dep: ../tcpd/libcouriertls.dep
+ 	cp /dev/null libcouriertls.dep ; . ../tcpd/couriertls.config ; \
+diff -Nur old/libmail/Makefile.am new/libmail/Makefile.am
+--- old/libmail/Makefile.am	2005-06-19 13:15:28.000000000 +0000
++++ new/libmail/Makefile.am	2005-07-07 23:41:53.818844096 +0000
+@@ -130,20 +130,18 @@
+ 	../numlib/libnumlib.la ../tcpd/libspipe.la ../soxwrap/libsoxwrap.a \
+ 	../soxwrap/soxlibs.dep
+ 
+-mailtool_LDADD=libmail.la ../rfc2045/librfc2045.la \
+-	../rfc822/librfc822.la ../rfc822/libencode.la \
+-	../maildir/libmaildir.la \
++mailtool_LDADD=.libs/libmail.a ../rfc2045/.libs/librfc2045.a \
++	../rfc822/.libs/librfc822.a ../rfc822/.libs/libencode.a \
++	../maildir/.libs/libmaildir.a \
+ 	@LIBCOURIERTLS@ `cat ../tcpd/libcouriertls.dep` \
+-	../liblock/liblock.la ../unicode/libunicode.la \
+-	../libhmac/libhmac.la ../md5/libmd5.la ../sha1/libsha1.la \
+-	../numlib/libnumlib.la ../tcpd/libspipe.la ../soxwrap/libsoxwrap.a \
++	../liblock/.libs/liblock.a ../unicode/.libs/libunicode.a \
++	../libhmac/.libs/libhmac.a ../md5/.libs/libmd5.a ../sha1/.libs/libsha1.a \
++	../numlib/.libs/libnumlib.a ../tcpd/.libs/libspipe.a ../soxwrap/libsoxwrap.a \
+ 	`cat ../maildir/maildir.libdeps ../soxwrap/soxlibs.dep`
+-mailtool_LDFLAGS=-static
+ 
+ testsuite_SOURCES=testsuite.C
+ testsuite_DEPENDENCIES=$(mailtool_DEPENDENCIES)
+ testsuite_LDADD=$(mailtool_LDADD)
+-testsuite_LDFLAGS=-static
+ 
+ EXTRA_DIST=autodeps.C testsuite.txt
+ 
+diff -Nur old/maildir/Makefile.am new/maildir/Makefile.am
+--- old/maildir/Makefile.am	2005-06-19 13:15:28.000000000 +0000
++++ new/maildir/Makefile.am	2005-07-07 22:46:49.213220512 +0000
+@@ -55,46 +55,40 @@
+ deliverquota_SOURCES=deliverquota.c
+ deliverquota_DEPENDENCIES=libmaildir.la ../rfc822/librfc822.la \
+ 				../numlib/libnumlib.la
+-deliverquota_LDADD=libmaildir.la ../rfc822/librfc822.la ../numlib/libnumlib.la
+-deliverquota_LDFLAGS=-static
++deliverquota_LDADD=.libs/libmaildir.a ../rfc822/.libs/librfc822.a \
++	../numlib/.libs/libnumlib.a
+ 
+ maildirmake_SOURCES=maildirmake.c
+ maildirmake_DEPENDENCIES=libmaildir.la ../numlib/libnumlib.la \
+ 			../rfc822/librfc822.la
+-maildirmake_LDADD=libmaildir.la ../numlib/libnumlib.la \
+-			../rfc822/librfc822.la
+-maildirmake_LDFLAGS=-static
++maildirmake_LDADD=.libs/libmaildir.a ../rfc822/.libs/librfc822.a \
++	../numlib/.libs/libnumlib.a
+ 
+ testmaildirfilter_SOURCES=maildirfiltertypelist.h testmaildirfilter.c
+ testmaildirfilter_DEPENDENCIES=libmaildir.la ../numlib/libnumlib.la
+-testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la
+-testmaildirfilter_LDFLAGS=-static
++testmaildirfilter_LDADD=.libs/libmaildir.a ../numlib/.libs/libnumlib.a
+ 
+ maildirkwtest_SOURCES=maildirkwtest.c
+-maildirkwtest_LDADD=libmaildir.la
++maildirkwtest_LDADD=.libs/libmaildir.a
+ maildirkwtest_DEPENDENCIES=libmaildir.la
+-maildirkwtest_LDFLAGS=-static
+ 
+ maildirkw_SOURCES=maildirkw.c
+-maildirkw_LDADD=libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \
+-		`cat maildir.libdeps`
++maildirkw_LDADD=.libs/libmaildir.a ../liblock/.libs/liblock.a \
++		../numlib/.libs/libnumlib.a `cat maildir.libdeps`
+ maildirkw_DEPENDENCIES=libmaildir.la ../liblock/liblock.la \
+ 	../numlib/libnumlib.la maildir.libdeps
+-maildirkw_LDFLAGS=-static
+ 
+ maildiracl=maildiracl.c
+-maildiracl_LDADD=libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \
+-			`cat maildir.libdeps`
++maildiracl_LDADD=.libs/libmaildir.a ../liblock/.libs/liblock.a \
++		../numlib/.libs/libnumlib.a `cat maildir.libdeps`
+ maildiracl_DEPENDENCIES=libmaildir.la ../liblock/liblock.la \
+ 		../numlib/libnumlib.la maildir.libdeps
+-maildiracl_LDFLAGS=-static
+ 
+ maildiraclttest_SOURCES=testmaildiraclt.c
+-maildiraclttest_LDADD=libmaildir.la ../liblock/liblock.la \
+-		../numlib/libnumlib.la `cat maildir.libdeps`
++maildiraclttest_LDADD=.libs/libmaildir.a ../liblock/.libs/liblock.a \
++		../numlib/.libs/libnumlib.a `cat maildir.libdeps`
+ maildiraclttest_DEPENDENCIES=libmaildir.la ../liblock/liblock.la \
+ 		../numlib/libnumlib.la maildir.libdeps
+-maildiraclttest_LDFLAGS=-static
+ 
+ EXTRA_DIST=README.maildirquota.html README.maildirquota.txt \
+ 	README.imapkeywords.html \
================================================================



More information about the pld-cvs-commit mailing list