]>
Commit | Line | Data |
---|---|---|
c8d3a85d JB |
1 | --- cyrus-sasl-2.1.21/sasldb/Makefile.am.orig 2005-05-07 06:54:18.000000000 +0200 |
2 | +++ cyrus-sasl-2.1.21/sasldb/Makefile.am 2005-05-20 22:52:50.027548768 +0200 | |
46e966f6 AF |
3 | @@ -51,7 +51,6 @@ |
4 | EXTRA_DIST = NTMakefile | |
8b207515 | 5 | |
6 | noinst_LTLIBRARIES = libsasldb.la | |
7 | -noinst_LIBRARIES = libsasldb.a | |
8 | ||
9 | libsasldb_la_SOURCES = allockey.c sasldb.h | |
10 | EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) | |
c8d3a85d | 11 | @@ -61,8 +60,3 @@ |
8b207515 | 12 | # Prevent make dist stupidity |
13 | libsasldb_a_SOURCES = | |
14 | EXTRA_libsasldb_a_SOURCES = | |
15 | - | |
c8d3a85d JB |
16 | -libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) |
17 | - $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) | |
8b207515 | 18 | - |
46e966f6 | 19 | - |
94e6777d JB |
20 | --- cyrus-sasl-2.1.25/lib/Makefile.am.orig 2011-09-05 16:18:10.000000000 +0200 |
21 | +++ cyrus-sasl-2.1.25/lib/Makefile.am 2011-09-16 18:57:36.749138290 +0200 | |
22 | @@ -76,25 +76,6 @@ | |
c8d3a85d JB |
23 | install-exec-hook: |
24 | endif | |
25 | ||
26 | -libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) | |
27 | - @echo adding static plugins and dependencies | |
28 | - $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) | |
29 | - @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ | |
30 | - if test ! -f $$i; then continue; fi; . $$i; \ | |
31 | - for j in $$dependency_libs foo; do \ | |
32 | - case $$j in foo) ;; \ | |
33 | - -L*) for k in $$depdirs foo; do \ | |
34 | - if test $$k = $$j; then break; fi; done; \ | |
35 | - if test $$k = foo; then depdirs="$$depdirs $$j"; fi ;; \ | |
36 | - -l*) for k in $$deplibs foo; do \ | |
37 | - if test $$k = $$j; then break; fi; done; \ | |
38 | - if test $$k = foo; then deplibs="$$deplibs $$j"; fi ;; \ | |
39 | - esac; done; dependency_libs=""; done; \ | |
40 | - sed -e "/^dependency_libs=/s%=.*%='$${depdirs}$${deplibs}'%" \ | |
41 | - libsasl2.la >TMP.$$ && mv TMP.$$ libsasl2.la | |
42 | - rm -f $@ | |
43 | - ln -s .libs/$@ $@ | |
44 | - | |
94e6777d | 45 | $(SASL_STATIC_SRCS): linksrcs |
c8d3a85d JB |
46 | |
47 | linksrcs: |