[svn] GnuPG - r4156 - branches/GNUPG-1-9-BRANCH/tools

[svn author marcus]

Author: marcus
Date: 2006-06-09 13:32:22 +0200 (Fri, 09 Jun 2006)
New Revision: 4156

Modified:
   branches/GNUPG-1-9-BRANCH/tools/ChangeLog
   branches/GNUPG-1-9-BRANCH/tools/Makefile.am
Log:
2006-06-09  Marcus Brinkmann  <marcus at g10code.de>

	* Makefile.am (gpgconf_LDADD): Add $(GPG_ERROR_LIBS).
	(gpgkey2ssh_LDADD): Add ../jnlib/libjnlib.a.


Modified: branches/GNUPG-1-9-BRANCH/tools/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/tools/ChangeLog	2006-06-09 10:28:26 UTC (rev 4155)
+++ branches/GNUPG-1-9-BRANCH/tools/ChangeLog	2006-06-09 11:32:22 UTC (rev 4156)
@@ -1,3 +1,8 @@
+2006-06-09  Marcus Brinkmann  <marcus at g10code.de>
+
+	* Makefile.am (gpgconf_LDADD): Add $(GPG_ERROR_LIBS).
+	(gpgkey2ssh_LDADD): Add ../jnlib/libjnlib.a.
+
 2006-05-23  Werner Koch  <wk at g10code.com>
 
 	* gpgparsemail.c: Include config.h if available

Modified: branches/GNUPG-1-9-BRANCH/tools/Makefile.am
===================================================================
--- branches/GNUPG-1-9-BRANCH/tools/Makefile.am	2006-06-09 10:28:26 UTC (rev 4155)
+++ branches/GNUPG-1-9-BRANCH/tools/Makefile.am	2006-06-09 11:32:22 UTC (rev 4156)
@@ -42,8 +42,10 @@
 
 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 @@
 
 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)