Author: arekm Date: Thu Sep 29 19:25:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated
---- Files affected: SOURCES: libdomainkeys-libtool.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/libdomainkeys-libtool.patch diff -u SOURCES/libdomainkeys-libtool.patch:1.2 SOURCES/libdomainkeys-libtool.patch:1.3 --- SOURCES/libdomainkeys-libtool.patch:1.2 Sat Jun 25 16:54:26 2005 +++ SOURCES/libdomainkeys-libtool.patch Thu Sep 29 21:25:42 2005 @@ -1,16 +1,16 @@ -diff -urN libdomainkeys-0.66.org/Makefile libdomainkeys-0.66/Makefile ---- libdomainkeys-0.66.org/Makefile 2005-06-21 22:39:41.000000000 +0200 -+++ libdomainkeys-0.66/Makefile 2005-06-25 16:20:20.000000000 +0200 -@@ -1,7 +1,7 @@ - CC=gcc +diff -urbB libdomainkeys-0.68.org/Makefile libdomainkeys-0.68/Makefile +--- libdomainkeys-0.68.org/Makefile 2005-08-30 22:31:39.000000000 +0200 ++++ libdomainkeys-0.68/Makefile 2005-09-29 21:24:08.000000000 +0200 +@@ -2,7 +2,7 @@ CFLAGS=-DBIND_8_COMPAT -O2 + #CFLAGS += -DDK_DEBUG -DDK_HASH_BUFF -Wall INCS=-I. -LIBS=-L. -ldomainkeys -lcrypto +LIBS=-lcrypto -lresolv MAKE=make UNAME := $(shell uname) -@@ -13,37 +13,35 @@ +@@ -14,49 +14,44 @@ CFLAGS += -DUNIXWARE endif @@ -42,8 +42,8 @@ - $(CC) $(CFLAGS) -c dns_txt.c -dnstest.o: dnstest.c - $(CC) $(CFLAGS) -c dnstest.c --dnstest: dnstest.o dns_txt.o libdomainkeys.a -- $(CC) $(CFLAGS) -o dnstest dnstest.o dns_txt.o -lresolv $(LIBS) +-dnstest: dnstest.o dns_txt.o libdomainkeys.a dns.lib +- $(CC) $(CFLAGS) -o dnstest dnstest.o dns_txt.o `cat dns.lib` $(LIBS) -dns.lib: dnstest.c - (if $(MAKE) dnstest >/dev/null 2>&1; then echo -lresolv; else echo ""; fi) >dns.lib + libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $< @@ -61,11 +61,29 @@ - rm -f libdomainkeys.a - ar cr libdomainkeys.a domainkeys.o dns_txt.o dktrace.o - ranlib libdomainkeys.a +- +-python: domainkeys_wrap.o _domainkeys.so +- +-domainkeys_wrap.o: domainkeys.h domainkeys.i domainkeys_wrap.c +- #swig -python -module domainkeys domainkeys.i +- $(CC) $(CFLAGS) -c domainkeys_wrap.c -I/usr/include/python2.4/ +domainkeys.lo dns_txt.lo dktrace.lo: %.lo: %.c + libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) $(OPTS) -o $@ -c $< + +libdomainkeys.la: domainkeys.lo dns_txt.lo dktrace.lo + libtool --mode=link --tag=CXX $(CC) domainkeys.lo dns_txt.lo dktrace.lo -o $@ -rpath /usr/lib -version-info 0:66 $(LIBS) ++ ++domainkeys_wrap.o: domainkeys_wrap.c ++ $(CC) $(CFLAGS) -c domainkeys_wrap.c -I /usr/include/python2.2/ + +-_domainkeys.so: domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o +- ld -shared domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o -lcrypto -lresolv -o _domainkeys.so ++_domainkeys.so: domainkeys.o dns_txt.o ++ ld -shared domainkeys.o dns_txt.o domainkeys_wrap.o -lcrypto -lresolv -o _domainkeys.so + + clean: +- rm -f *.o *.so libdomainkeys.a dns.lib dnstest makeheader dktest testtrace domainkeys.h ++ rm -f *.o libdomainkeys.a dns.lib dnstest makeheader dktest testtrace domainkeys.h - domainkeys_wrap.o: domainkeys_wrap.c - $(CC) $(CFLAGS) -c domainkeys_wrap.c -I /usr/include/python2.2/ + # + distributionfile: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/libdomainkeys-libtool.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit