]>
Commit | Line | Data |
---|---|---|
6f14ca7d AM |
1 | diff -urbB libdomainkeys-0.68.org/Makefile libdomainkeys-0.68/Makefile |
2 | --- libdomainkeys-0.68.org/Makefile 2005-08-30 22:31:39.000000000 +0200 | |
3 | +++ libdomainkeys-0.68/Makefile 2005-09-29 21:24:08.000000000 +0200 | |
4 | @@ -2,7 +2,7 @@ | |
421211b2 | 5 | CFLAGS=-DBIND_8_COMPAT -O2 |
6f14ca7d | 6 | #CFLAGS += -DDK_DEBUG -DDK_HASH_BUFF -Wall |
421211b2 AM |
7 | INCS=-I. |
8 | -LIBS=-L. -ldomainkeys -lcrypto | |
9 | +LIBS=-lcrypto -lresolv | |
10 | MAKE=make | |
11 | ||
12 | UNAME := $(shell uname) | |
6f14ca7d | 13 | @@ -14,49 +14,44 @@ |
421211b2 AM |
14 | CFLAGS += -DUNIXWARE |
15 | endif | |
16 | ||
17 | +dktest: dktest.lo libdomainkeys.la | |
18 | + libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ dktest.lo libdomainkeys.la $(LIBS) | |
19 | ||
20 | -dktest: dktest.o libdomainkeys.a dns.lib | |
21 | - $(CC) $(CFLAGS) -o dktest dktest.o $(LIBS) `cat dns.lib` | |
22 | +dktest.lo: dktest.c domainkeys.h libdomainkeys.la | |
23 | + libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $< | |
24 | ||
25 | -dktest.o: dktest.c domainkeys.h | |
26 | - $(CC) $(CFLAGS) -c dktest.c $(INCS) | |
27 | - | |
28 | -testtrace: testtrace.o dktrace.o dktrace.h | |
29 | - $(CC) $(CFLAGS) -o testtrace testtrace.o dktrace.o | |
30 | - | |
31 | -dktrace.o: dktrace.c dktrace.h | |
32 | +testtrace: testtrace.lo dktrace.lo dktrace.h libdomainkeys.la | |
33 | + libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ $< $(LIBS) | |
34 | ||
35 | makeheader: makeheader.c | |
36 | - $(CC) $(CFLAGS) -o makeheader makeheader.c | |
37 | + libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ $< | |
38 | + | |
39 | domainkeys.o: domainkeys.c | |
40 | - $(CC) $(CFLAGS) -c domainkeys.c $(INCS) | |
41 | -dns_txt.o: dns_txt.c | |
42 | - $(CC) $(CFLAGS) -c dns_txt.c | |
43 | -dnstest.o: dnstest.c | |
44 | - $(CC) $(CFLAGS) -c dnstest.c | |
6f14ca7d AM |
45 | -dnstest: dnstest.o dns_txt.o libdomainkeys.a dns.lib |
46 | - $(CC) $(CFLAGS) -o dnstest dnstest.o dns_txt.o `cat dns.lib` $(LIBS) | |
421211b2 AM |
47 | -dns.lib: dnstest.c |
48 | - (if $(MAKE) dnstest >/dev/null 2>&1; then echo -lresolv; else echo ""; fi) >dns.lib | |
49 | + libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $< | |
50 | + | |
51 | +dnstest.lo: dnstest.c | |
52 | + libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $< | |
53 | + | |
54 | +dnstest: dnstest.lo dns_txt.lo libdomainkeys.la | |
55 | + libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ $< $(LIBS) | |
56 | + | |
57 | domainkeys.h: domainkeys.c makeheader | |
58 | ./makeheader <domainkeys.c >domainkeys.h | |
59 | ||
60 | -libdomainkeys.a: domainkeys.o dns_txt.o dktrace.o | |
61 | - rm -f libdomainkeys.a | |
62 | - ar cr libdomainkeys.a domainkeys.o dns_txt.o dktrace.o | |
63 | - ranlib libdomainkeys.a | |
6f14ca7d AM |
64 | - |
65 | -python: domainkeys_wrap.o _domainkeys.so | |
66 | - | |
67 | -domainkeys_wrap.o: domainkeys.h domainkeys.i domainkeys_wrap.c | |
68 | - #swig -python -module domainkeys domainkeys.i | |
69 | - $(CC) $(CFLAGS) -c domainkeys_wrap.c -I/usr/include/python2.4/ | |
421211b2 | 70 | +domainkeys.lo dns_txt.lo dktrace.lo: %.lo: %.c |
852ce095 | 71 | + libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) $(OPTS) -o $@ -c $< |
421211b2 AM |
72 | + |
73 | +libdomainkeys.la: domainkeys.lo dns_txt.lo dktrace.lo | |
74 | + libtool --mode=link --tag=CXX $(CC) domainkeys.lo dns_txt.lo dktrace.lo -o $@ -rpath /usr/lib -version-info 0:66 $(LIBS) | |
6f14ca7d AM |
75 | + |
76 | +domainkeys_wrap.o: domainkeys_wrap.c | |
77 | + $(CC) $(CFLAGS) -c domainkeys_wrap.c -I /usr/include/python2.2/ | |
78 | ||
79 | -_domainkeys.so: domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o | |
80 | - ld -shared domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o -lcrypto -lresolv -o _domainkeys.so | |
81 | +_domainkeys.so: domainkeys.o dns_txt.o | |
82 | + ld -shared domainkeys.o dns_txt.o domainkeys_wrap.o -lcrypto -lresolv -o _domainkeys.so | |
83 | ||
84 | clean: | |
85 | - rm -f *.o *.so libdomainkeys.a dns.lib dnstest makeheader dktest testtrace domainkeys.h | |
86 | + rm -f *.o libdomainkeys.a dns.lib dnstest makeheader dktest testtrace domainkeys.h | |
421211b2 | 87 | |
6f14ca7d AM |
88 | # |
89 | distributionfile: |