[svn] GnuPG - r4257 - in trunk: . agent doc g10 include kbx
keyserver sm tools
svn author wk
cvs at cvs.gnupg.org
Wed Sep 20 13:01:52 CEST 2006
Author: wk
Date: 2006-09-20 13:01:49 +0200 (Wed, 20 Sep 2006)
New Revision: 4257
Added:
trunk/doc/texi.css
trunk/include/Makefile.am
Removed:
trunk/include/distfiles
trunk/include/errors.h
trunk/include/http.h
trunk/include/i18n.h
trunk/include/memory.h
trunk/include/mpi.h
trunk/include/util.h
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/TODO
trunk/agent/ChangeLog
trunk/agent/Makefile.am
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/Makefile.am
trunk/doc/debugging.texi
trunk/doc/gnupg.texi
trunk/g10/ChangeLog
trunk/g10/call-agent.c
trunk/include/ChangeLog
trunk/kbx/ChangeLog
trunk/kbx/Makefile.am
trunk/keyserver/Makefile.am
trunk/sm/ChangeLog
trunk/sm/Makefile.am
trunk/tools/ChangeLog
trunk/tools/Makefile.am
Log:
Cleanups.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,8 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (dist-hook): Removed distfiles cruft.
+ (SUBDIRS): Added include
+
2006-09-18 Werner Koch <wk at g10code.com>
Released 1.9.23.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -73,19 +73,10 @@
tests = tests
endif
-SUBDIRS = m4 intl gl jnlib common ${kbx} \
+SUBDIRS = m4 intl gl include jnlib common ${kbx} \
${gpg} ${keyserver} ${sm} ${agent} ${scd} ${tools} po ${doc} ${tests}
dist-hook:
- @set -e; \
- for file in `cd $(top_srcdir); \
- find scripts include -type f -name distfiles`; do \
- dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \
- for i in distfiles `cat $(top_srcdir)/$$file` ; do \
- ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \
- || cp -p $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i; \
- done ; \
- done
echo "$(VERSION)" > $(distdir)/VERSION
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/TODO 2006-09-20 11:01:49 UTC (rev 4257)
@@ -119,5 +119,3 @@
* Extend selinux support to other modules
-* Missing dependencies on libcommon.
- parallel builds fail.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/agent/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,7 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * Makefile.am: Changes to allow parallel make runs.
+
2006-09-15 Werner Koch <wk at g10code.com>
* trustlist.c: Entirely rewritten.
Modified: trunk/agent/Makefile.am
===================================================================
--- trunk/agent/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/agent/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -47,9 +47,12 @@
learncard.c
-gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
+common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
+pwquery_libs = ../common/libsimple-pwquery.a
+
+gpg_agent_LDADD = $(common_libs) \
$(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
- $(GPG_ERROR_LIBS) @LIBINTL@ $(NETLIBS)
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
gpg_protect_tool_SOURCES = \
protect-tool.c \
@@ -57,9 +60,8 @@
minip12.c minip12.h
# Needs $(NETLIBS) for libsimple-pwquery.la.
-gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \
- ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ $(NETLIBS)
+gpg_protect_tool_LDADD = $(pwquery_libs) $(common_libs) \
+ $(LIBGCRYPT_LIBS) -lgpg-error $(LIBINTL) $(NETLIBS)
if HAVE_W32_SYSTEM
gpg_protect_tool_LDADD += -lwsock32
endif
@@ -68,20 +70,24 @@
preset-passphrase.c
# Needs $(NETLIBS) for libsimple-pwquery.la.
-gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \
- ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
+gpg_preset_passphrase_LDADD = $(pwquery_libs) $(common_libs) \
$(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ $(NETLIBS)
if HAVE_W32_SYSTEM
gpg_preset_passphrase_LDADD += -lwsock32
endif
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs) $(pwquery_libs)
+
+
#
# Module tests
#
TESTS = t-protect
-t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
+t_common_ldadd = $(common_libs) \
+ $(LIBGCRYPT_LIBS) -lgpg-error $(LIBINTL)
t_protect_SOURCES = t-protect.c protect.c
t_protect_LDADD = $(t_common_ldadd)
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/configure.ac 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1308,6 +1308,7 @@
po/Makefile.in
intl/Makefile
gl/Makefile
+include/Makefile
jnlib/Makefile
common/Makefile
kbx/Makefile
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/doc/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,9 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * texi.css: New. Note that the current vesion of makeinfo has a
+ bug while copying the @import directive. A pacth has been send to
+ upstream.
+
2006-09-19 Werner Koch <wk at g10code.com>
* gpg.texi: Some restructuring.
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/doc/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -28,7 +28,7 @@
gnupg-card-architecture.pdf \
faq.raw FAQ faq.html gnupg7.texi \
opt-homedir.texi see-also-note.texi specify-user-id.texi \
- $(examples)
+ texi.css $(examples)
BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
gnupg-card-architecture.pdf FAQ faq.html
@@ -44,7 +44,7 @@
tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
sysnotes.texi gnupg-card-architecture.fig
-AM_MAKEFINFOFLAGS = -I $(srcdir)
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css
YAT2M_OPTIONS = -I $(srcdir) \
--release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
Modified: trunk/doc/debugging.texi
===================================================================
--- trunk/doc/debugging.texi 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/doc/debugging.texi 2006-09-20 11:01:49 UTC (rev 4257)
@@ -9,8 +9,8 @@
there is a need to track down problems. We call this debugging in a
reminiscent to the moth jamming a relay in a Mark II box back in 1947.
-Most of the probelsm a merely configuration and user problems but
-nevertheless there are the most annoying ones and reposnible for may
+Most of the problems a merely configuration and user problems but
+nevertheless there are the most annoying ones and reponsible for many
gray hairs. We try to give some guidelines here on how to identify and
solve the problem at hand.
Modified: trunk/doc/gnupg.texi
===================================================================
--- trunk/doc/gnupg.texi 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/doc/gnupg.texi 2006-09-20 11:01:49 UTC (rev 4257)
@@ -30,8 +30,8 @@
@iftex
Published by the Free Software Foundation@*
-59 Temple Place - Suite 330@*
-Boston, MA 02111-1307 USA
+51 Franklin St, Fifth Floor@*
+Boston, MA 02110-1301 USA
@end iftex
Copyright @copyright{} 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
Added: trunk/doc/texi.css
===================================================================
--- trunk/doc/texi.css 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/doc/texi.css 2006-09-20 11:01:49 UTC (rev 4257)
@@ -0,0 +1,6 @@
+/* The gnupg.org standard stylesheet. */
+ @import url(/share/site.css);
+
+
+
+
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/g10/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,8 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * call-agent.c: Include asshelp.h.
+ (start_agent): Use send_pinentry_environment.
+
2006-09-14 Werner Koch <wk at g10code.com>
Replaced all call gpg_error_from_errno(errno) by
Modified: trunk/g10/call-agent.c
===================================================================
--- trunk/g10/call-agent.c 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/g10/call-agent.c 2006-09-20 11:01:49 UTC (rev 4257)
@@ -41,6 +41,7 @@
#include "membuf.h"
#include "options.h"
#include "i18n.h"
+#include "asshelp.h"
#include "call-agent.h"
#ifndef DBG_ASSUAN
@@ -81,11 +82,6 @@
int rc = 0;
char *infostr, *p;
assuan_context_t ctx;
- char *dft_display = NULL;
- char *dft_ttyname = NULL;
- char *dft_ttytype = NULL;
- char *old_lc = NULL;
- char *dft_lc = NULL;
if (agent_ctx)
return 0; /* fixme: We need a context for each thread or serialize
@@ -177,123 +173,13 @@
if (DBG_ASSUAN)
log_debug ("connection to agent established\n");
- rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
+ rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL,NULL);
if (rc)
return rc;
-#ifdef __GNUC__
-#warning put this code into common/asshelp.c
-#endif
-
- dft_display = getenv ("DISPLAY");
- if (opt.display || dft_display)
- {
- char *optstr;
- if (asprintf (&optstr, "OPTION display=%s",
- opt.display ? opt.display : dft_display) < 0)
- return gpg_error_from_syserror ();
- rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
- NULL);
- free (optstr);
- if (rc)
- return rc;
- }
- if (!opt.ttyname)
- {
- dft_ttyname = getenv ("GPG_TTY");
- if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
- dft_ttyname = ttyname (0);
- }
- if (opt.ttyname || dft_ttyname)
- {
- char *optstr;
- if (asprintf (&optstr, "OPTION ttyname=%s",
- opt.ttyname ? opt.ttyname : dft_ttyname) < 0)
- return gpg_error_from_syserror ();
- rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
- NULL);
- free (optstr);
- if (rc)
- return rc;
- }
- dft_ttytype = getenv ("TERM");
- if (opt.ttytype || (dft_ttyname && dft_ttytype))
- {
- char *optstr;
- if (asprintf (&optstr, "OPTION ttytype=%s",
- opt.ttyname ? opt.ttytype : dft_ttytype) < 0)
- return gpg_error_from_syserror ();
- rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
- NULL);
- free (optstr);
- if (rc)
- return rc;
- }
-#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
- old_lc = setlocale (LC_CTYPE, NULL);
- if (old_lc)
- {
- old_lc = strdup (old_lc);
- if (!old_lc)
- return gpg_error_from_syserror ();
-
- }
- dft_lc = setlocale (LC_CTYPE, "");
-#endif
- if (opt.lc_ctype || (dft_ttyname && dft_lc))
- {
- char *optstr;
- if (asprintf (&optstr, "OPTION lc-ctype=%s",
- opt.lc_ctype ? opt.lc_ctype : dft_lc) < 0)
- rc = gpg_error_from_syserror ();
- else
- {
- rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
- NULL);
- free (optstr);
- }
- }
-#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
- if (old_lc)
- {
- setlocale (LC_CTYPE, old_lc);
- free (old_lc);
- }
-#endif
- if (rc)
- return rc;
-#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
- old_lc = setlocale (LC_MESSAGES, NULL);
- if (old_lc)
- {
- old_lc = strdup (old_lc);
- if (!old_lc)
- return gpg_error_from_syserror ();
- }
- dft_lc = setlocale (LC_MESSAGES, "");
-#endif
- if (opt.lc_messages || (dft_ttyname && dft_lc))
- {
- char *optstr;
- if (asprintf (&optstr, "OPTION lc-messages=%s",
- opt.lc_messages ? opt.lc_messages : dft_lc) < 0)
- rc = gpg_error_from_syserror ();
- else
- {
- rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
- NULL);
- free (optstr);
- }
- }
-#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
- if (old_lc)
- {
- setlocale (LC_MESSAGES, old_lc);
- free (old_lc);
- }
-#endif
-
- return rc;
+ return send_pinentry_environment (agent_ctx, GPG_ERR_SOURCE_DEFAULT,
+ opt.display, opt.ttyname, opt.ttytype,
+ opt.lc_ctype, opt.lc_messages);
}
Modified: trunk/include/ChangeLog
===================================================================
--- trunk/include/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/include/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,9 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * errors.h, http.h, memory.h, mpi.h, util.h, i18n.h: Removed.
+ * Makefile.am: New.
+ * distfiles: Removed.
+
2006-08-16 Werner Koch <wk at g10code.com>
* keyserver.h: Moved to ../common.
Added: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/include/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -0,0 +1 @@
+EXTRA_DIST = cipher.h types.h host2net.h _regex.h
Deleted: trunk/include/distfiles
Deleted: trunk/include/errors.h
Deleted: trunk/include/http.h
Deleted: trunk/include/i18n.h
Deleted: trunk/include/memory.h
Deleted: trunk/include/mpi.h
Deleted: trunk/include/util.h
Modified: trunk/kbx/ChangeLog
===================================================================
--- trunk/kbx/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/kbx/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,7 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * Makefile.am ($(PROGRAMS): New.
+
2006-09-14 Werner Koch <wk at g10code.com>
Replaced all call gpg_error_from_errno(errno) by
Modified: trunk/kbx/Makefile.am
===================================================================
--- trunk/kbx/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/kbx/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -50,3 +50,4 @@
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
-lgpg-error $(LIBINTL) ../common/libcommon.a
+$(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a
Modified: trunk/keyserver/Makefile.am
===================================================================
--- trunk/keyserver/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/keyserver/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -32,7 +32,7 @@
libexec_SCRIPTS = $(GPGKEYS_MAILTO)
noinst_SCRIPTS = gpgkeys_test
-needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
+common_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
@@ -42,18 +42,18 @@
gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
-gpg2keys_ldap_LDADD = $(needed_libs) $(LDAPLIBS) $(NETLIBS) \
+gpg2keys_ldap_LDADD = $(common_libs) $(LDAPLIBS) $(NETLIBS) \
$(other_libs) $(W32LIBS)
-gpg2keys_finger_LDADD = $(needed_libs) $(LIBGCRYPT_LIBS) \
+gpg2keys_finger_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) \
$(NETLIBS) $(other_libs) $(W32LIBS)
if FAKE_CURL
gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
-gpg2keys_curl_LDADD = $(needed_libs) $(NETLIBS) $(DNSLIBS) \
+gpg2keys_curl_LDADD = $(common_libs) $(NETLIBS) $(DNSLIBS) \
$(other_libs) $(W32LIBS)
gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
-gpg2keys_hkp_LDADD = $(needed_libs) $(NETLIBS) $(DNSLIBS) \
+gpg2keys_hkp_LDADD = $(common_libs) $(NETLIBS) $(DNSLIBS) \
$(other_libs) $(W32LIBS)
else
gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
@@ -62,3 +62,8 @@
gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
endif
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs)
+
+
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/sm/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,7 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * Makefile.am: Changes to allow parallel make runs.
+
2006-09-18 Werner Koch <wk at g10code.com>
* gpgsm.c (main): Use this to import standard certificates.
Modified: trunk/sm/Makefile.am
===================================================================
--- trunk/sm/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/sm/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -54,9 +54,18 @@
qualified.c
-gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
- ../common/libcommon.a ../gl/libgnu.a \
+common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
+ ../common/libcommon.a ../gl/libgnu.a
+
+gpgsm_LDADD = $(common_libs) \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
$(LIBINTL) $(PTH_LIBS) $(ZLIBS)
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs)
+
+
+
+
Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/tools/ChangeLog 2006-09-20 11:01:49 UTC (rev 4257)
@@ -1,3 +1,7 @@
+2006-09-20 Werner Koch <wk at g10code.com>
+
+ * Makefile.am: Changes to allow parallel make runs.
+
2006-09-12 Werner Koch <wk at g10code.com>
Replaced all call gpg_error_from_errno(errno) by
Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am 2006-09-19 16:25:51 UTC (rev 4256)
+++ trunk/tools/Makefile.am 2006-09-20 11:01:49 UTC (rev 4257)
@@ -51,6 +51,7 @@
noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
+pwquery_libs = ../common/libsimple-pwquery.a
gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS)
@@ -58,24 +59,20 @@
# 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)
+gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS)
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
gpgparsemail_LDADD =
symcryptrun_SOURCES = symcryptrun.c
-symcryptrun_LDADD = $(LIBUTIL_LIBS) ../jnlib/libjnlib.a \
- ../common/libcommon.a ../gl/libgnu.a \
- ../common/libsimple-pwquery.a $(LIBGCRYPT_LIBS) \
- $(GPG_ERROR_LIBS) $(LIBINTL)
+symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
+ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
watchgnupg_SOURCES = watchgnupg.c
watchgnupg_LDADD = $(NETLIBS)
gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
-gpg_connect_agent_LDADD = ../jnlib/libjnlib.a \
- ../common/libcommon.a ../gl/libgnu.a \
+gpg_connect_agent_LDADD = $(common_libs) \
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
gpgkey2ssh_SOURCES = gpgkey2ssh.c
@@ -86,3 +83,7 @@
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs) $(pwquery_libs)
+
More information about the Gnupg-commits
mailing list