agent/

2005-10-08  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (gpg_protect_tool_LDADD): Add ../gl/libgnu.a.
	(gpg_preset_passphrase_LDADD, t_common_ldadd): Likewise.
	(gpg_agent_LDADD): Add ../gl/libgnu.a after ../common/libcommon.a.

kbx/
2005-10-08  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (kbxutil_LDADD): Add ../gl/libgnu.a after
	../jnlib/libjnlib.a.

scd/
2005-10-08  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (scdaemon_LDADD): Add ../gl/libgnu.a after
	../common/libcommon.a.
sm/
2005-10-08  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (gpgsm_LDADD): Add ../gl/libgnu.a after
	../common/libcommon.a.

tools/
2005-10-08  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (gpgconf_LDADD): Add ../gl/libgnu.a after
	../common/libcommon.a.
	(symcryptrun_LDADD, gpg_connect_agent_LDADD, gpgkey2ssh_LDADD):
	Likewise.

10 files changed, 43 insertions, 15 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 8aa219d9a..975484007 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (gpg_protect_tool_LDADD): Add ../gl/libgnu.a.
+	(gpg_preset_passphrase_LDADD, t_common_ldadd): Likewise.
+	(gpg_agent_LDADD): Add ../gl/libgnu.a after ../common/libcommon.a.
+
 2005-09-16  Werner Koch  <wk@g10code.com>
 
 	* minip12.c (build_key_sequence, build_cert_sequence): Fixed
diff --git a/agent/Makefile.am b/agent/Makefile.am
index c1a7c820e..ec930fe3f 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -45,7 +45,7 @@ gpg_agent_SOURCES = \
 	learncard.c
 
 
-gpg_agent_LDADD = ../gl/libgnu.a ../jnlib/libjnlib.a ../common/libcommon.a \
+gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
                 $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
 	         -lgpg-error @LIBINTL@
 
@@ -55,7 +55,7 @@ gpg_protect_tool_SOURCES = \
 	minip12.c minip12.h 
 
 gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \
-	../jnlib/libjnlib.a  ../common/libcommon.a  \
+	../jnlib/libjnlib.a  ../common/libcommon.a ../gl/libgnu.a \
 	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
 if HAVE_W32_SYSTEM
 gpg_protect_tool_LDADD += -lwsock32
@@ -65,7 +65,7 @@ gpg_preset_passphrase_SOURCES = \
 	preset-passphrase.c
 
 gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \
-	../jnlib/libjnlib.a ../common/libcommon.a \
+	../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
 	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
 if HAVE_W32_SYSTEM
 gpg_preset_passphrase_LDADD += -lwsock32
@@ -76,7 +76,7 @@ endif
 #
 TESTS = t-protect
 
-t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a  \
+t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
                  $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
 
 t_protect_SOURCES = t-protect.c protect.c 
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index 4fd06d5ca..14b702318 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (kbxutil_LDADD): Add ../gl/libgnu.a after
+	../jnlib/libjnlib.a.
+
 2005-06-15  Werner Koch  <wk@g10code.com>
 
 	* keybox-file.c (_keybox_read_blob2): Make IMAGE unsigned.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 85704eb66..f42e517bf 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -45,7 +45,7 @@ libkeybox_a_SOURCES = $(common_sources)
 
 # Note that libcommon is only required to resolve the LIBOBJS.
 kbxutil_SOURCES = kbxutil.c $(common_sources)
-kbxutil_LDADD   = ../gl/libgnu.a ../jnlib/libjnlib.a  \
+kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a \
 	          $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
                   -lgpg-error $(LIBINTL) ../common/libcommon.a
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 207670072..ccea117dd 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (scdaemon_LDADD): Add ../gl/libgnu.a after
+	../common/libcommon.a.
+
 2005-09-09  Werner Koch  <wk@g10code.com>
 
 	* pcsc-wrapper.c (main): Removed bogus free.
diff --git a/scd/Makefile.am b/scd/Makefile.am
index dadab4f67..9a32de98b 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -43,7 +43,7 @@ scdaemon_SOURCES = \
 	app.c app-common.h app-help.c $(card_apps)
 
 
-scdaemon_LDADD = ../gl/libgnu.a ../jnlib/libjnlib.a ../common/libcommon.a \
+scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
 	$(LIBUSB_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS)
 
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 41cf7bd35..aa9ac91bc 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (gpgsm_LDADD): Add ../gl/libgnu.a after
+	../common/libcommon.a.
+
 2005-09-08  Werner Koch  <wk@g10code.com>
 
 	* export.c (popen_protect_tool): Add option --have-cert.  We
diff --git a/sm/Makefile.am b/sm/Makefile.am
index e5311e967..69a286e55 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -52,8 +52,8 @@ gpgsm_SOURCES = \
 	certreqgen.c 
 
 
-gpgsm_LDADD = ../gl/libgnu.a ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
-              ../common/libcommon.a \
+gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
+              ../common/libcommon.a ../gl/libgnu.a \
               $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
 	      $(LIBINTL) $(PTH_LIBS)
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 45ad469b6..06576d41d 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (gpgconf_LDADD): Add ../gl/libgnu.a after
+	../common/libcommon.a.
+	(symcryptrun_LDADD, gpg_connect_agent_LDADD, gpgkey2ssh_LDADD):
+	Likewise.
+
 2005-09-29  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (AM_CFLAGS): Add $(LIBGCRYPT_CFLAGS).
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d68e16c09..0ec6e8e36 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -43,23 +43,23 @@ endif
 
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 
-gpgconf_LDADD = ../gl/libgnu.a ../jnlib/libjnlib.a \
-                ../common/libcommon.a @LIBINTL@
+gpgconf_LDADD = ../jnlib/libjnlib.a \
+                ../common/libcommon.a ../gl/libgnu.a @LIBINTL@
 
 symcryptrun_SOURCES = symcryptrun.c
-symcryptrun_LDADD = $(LIBUTIL_LIBS) ../gl/libgnu.a ../jnlib/libjnlib.a \
-                    ../common/libcommon.a \
+symcryptrun_LDADD = $(LIBUTIL_LIBS) ../jnlib/libjnlib.a \
+                    ../common/libcommon.a ../gl/libgnu.a \
 		    ../common/libsimple-pwquery.a $(LIBGCRYPT_LIBS) \
 		    $(GPG_ERROR_LIBS) $(LIBINTL)
 
 watchgnupg_SOURCES = watchgnupg.c 
 
 gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
-gpg_connect_agent_LDADD = ../gl/libgnu.a ../jnlib/libjnlib.a \
-                          ../common/libcommon.a \
+gpg_connect_agent_LDADD = ../jnlib/libjnlib.a \
+                          ../common/libcommon.a ../gl/libgnu.a \
                           $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
 
 gpgkey2ssh_SOURCES = gpgkey2ssh.c
 gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
-gpgkey2ssh_LDADD = ../gl/libgnu.a ../common/libcommon.a \
+gpgkey2ssh_LDADD = ../common/libcommon.a ../gl/libgnu.a \
                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)