diff options
| author | Marcus Brinkmann <[email protected]> | 2006-06-09 11:32:22 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2006-06-09 11:32:22 +0000 |
| commit | 5a8770fc6c7317e41c1042de726389243254bff4 (patch) | |
| tree | edfff7ee297463873a43780366c630658061b1b5 | |
| parent | 2006-06-09 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-5a8770fc6c7317e41c1042de726389243254bff4.tar.gz gnupg-5a8770fc6c7317e41c1042de726389243254bff4.zip | |
2006-06-09 Marcus Brinkmann <[email protected]>
* Makefile.am (gpgconf_LDADD): Add $(GPG_ERROR_LIBS).
(gpgkey2ssh_LDADD): Add ../jnlib/libjnlib.a.
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/Makefile.am | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 4ac20ae0b..25ffae5d2 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2006-06-09 Marcus Brinkmann <[email protected]> + + * Makefile.am (gpgconf_LDADD): Add $(GPG_ERROR_LIBS). + (gpgkey2ssh_LDADD): Add ../jnlib/libjnlib.a. + 2006-05-23 Werner Koch <[email protected]> * gpgparsemail.c: Include config.h if available diff --git a/tools/Makefile.am b/tools/Makefile.am index 519e87150..d9ef8812a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -42,8 +42,10 @@ endif gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c -gpgconf_LDADD = ../jnlib/libjnlib.a \ - ../common/libcommon.a ../gl/libgnu.a @LIBINTL@ +# jnlib/common sucks in gpg-error, will they, nil they (some compilers +# do not eliminate the supposed-to-be-unused-inline-functions). +gpgconf_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \ + ../gl/libgnu.a @LIBINTL@ $(GPG_ERROR_LIBS) gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h gpgparsemail_LDADD = @@ -64,5 +66,7 @@ gpg_connect_agent_LDADD = ../jnlib/libjnlib.a \ gpgkey2ssh_SOURCES = gpgkey2ssh.c gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) -gpgkey2ssh_LDADD = ../common/libcommon.a ../gl/libgnu.a \ +# common sucks in jnlib, via use of BUG() in an inline function, which +# some compilers do not eliminate. +gpgkey2ssh_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) |