]>
Commit | Line | Data |
---|---|---|
355df181 MT |
1 | diff -up gpgme-1.3.0/src/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/src/Makefile.am |
2 | --- gpgme-1.3.0/src/Makefile.am.ImplicitDSOLinking 2010-01-06 04:02:19.000000000 +0100 | |
3 | +++ gpgme-1.3.0/src/Makefile.am 2011-02-11 18:14:54.000000000 +0100 | |
4 | @@ -232,7 +232,7 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LI | |
5 | endif | |
6 | ||
7 | noinst_PROGRAMS = gpgme-tool | |
8 | -gpgme_tool_LDADD = libgpgme.la | |
9 | +gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ | |
10 | ||
11 | status-table.h : gpgme.h | |
12 | $(srcdir)/mkstatus < $(builddir)/gpgme.h > status-table.h | |
13 | diff -up gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/src/Makefile.in | |
14 | --- gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking 2010-01-11 12:06:54.000000000 +0100 | |
15 | +++ gpgme-1.3.0/src/Makefile.in 2011-02-11 18:17:10.000000000 +0100 | |
16 | @@ -572,7 +572,7 @@ libgpgme_pth_la_LIBADD = $(gpgme_res) @L | |
17 | @BUILD_W32_QT_TRUE@libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ | |
18 | @BUILD_W32_QT_TRUE@ @GPG_ERROR_LIBS@ @QT4_CORE_LIBS@ | |
19 | ||
20 | -gpgme_tool_LDADD = libgpgme.la | |
21 | +gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ | |
22 | all: $(BUILT_SOURCES) | |
23 | $(MAKE) $(AM_MAKEFLAGS) all-am | |
24 | ||
25 | diff -up gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.am | |
26 | --- gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking 2008-12-03 14:39:48.000000000 +0100 | |
27 | +++ gpgme-1.3.0/tests/gpgsm/Makefile.am 2011-02-11 17:36:32.000000000 +0100 | |
28 | @@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn | |
29 | INCLUDES = -I$(top_builddir)/src | |
30 | ||
31 | AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ | |
32 | -LDADD = ../../src/libgpgme.la | |
33 | +LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ | |
34 | ||
35 | # We don't run t-genkey in the test suite, because it takes too long | |
36 | # and needs a working pinentry. | |
37 | diff -up gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.in | |
38 | --- gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking 2010-01-11 12:06:54.000000000 +0100 | |
39 | +++ gpgme-1.3.0/tests/gpgsm/Makefile.in 2011-02-11 17:36:32.000000000 +0100 | |
40 | @@ -307,7 +307,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn | |
41 | ||
42 | INCLUDES = -I$(top_builddir)/src | |
43 | AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ | |
44 | -LDADD = ../../src/libgpgme.la | |
45 | +LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ | |
46 | key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 | |
47 | DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \ | |
48 | private-keys-v1.d/$(key_id).key random_seed | |
49 | diff -up gpgme-1.3.0/tests/opassuan/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/opassuan/Makefile.am | |
50 | --- gpgme-1.3.0/tests/opassuan/Makefile.am.ImplicitDSOLinking 2009-01-26 15:15:26.000000000 +0100 | |
51 | +++ gpgme-1.3.0/tests/opassuan/Makefile.am 2011-02-11 17:36:32.000000000 +0100 | |
52 | @@ -27,7 +27,7 @@ EXTRA_DIST = | |
53 | INCLUDES = -I$(top_builddir)/src | |
54 | ||
55 | AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ | |
56 | -LDADD = ../../src/libgpgme.la | |
57 | +LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ | |
58 | ||
59 | noinst_PROGRAMS = $(TESTS) t-command | |
60 | ||
61 | diff -up gpgme-1.3.0/tests/opassuan/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/opassuan/Makefile.in | |
62 | --- gpgme-1.3.0/tests/opassuan/Makefile.in.ImplicitDSOLinking 2010-01-11 12:06:54.000000000 +0100 | |
63 | +++ gpgme-1.3.0/tests/opassuan/Makefile.in 2011-02-11 17:36:32.000000000 +0100 | |
64 | @@ -258,7 +258,7 @@ noinst_HEADERS = | |
65 | EXTRA_DIST = | |
66 | INCLUDES = -I$(top_builddir)/src | |
67 | AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ | |
68 | -LDADD = ../../src/libgpgme.la | |
69 | +LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ | |
70 | DISTCLEANFILES = | |
71 | all: all-am | |
72 |