aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog7
-rw-r--r--tools/Makefile.am14
2 files changed, 14 insertions, 7 deletions
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 <[email protected]>
+
+ * 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 <[email protected]>
* 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)