diff options
| author | Werner Koch <[email protected]> | 2006-09-20 11:01:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-09-20 11:01:49 +0000 |
| commit | c69dc436ce9037ebf54383eb1adad728eb6fa859 (patch) | |
| tree | 86d1d65cb6ab4fced535e8e064c1a69df85ab8e5 /tools | |
| parent | Some restructuring (diff) | |
| download | gnupg-c69dc436ce9037ebf54383eb1adad728eb6fa859.tar.gz gnupg-c69dc436ce9037ebf54383eb1adad728eb6fa859.zip | |
Cleanups.
Diffstat (limited to '')
| -rw-r--r-- | tools/ChangeLog | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index e861b2953..7e400d708 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2006-09-20 Werner Koch <[email protected]> + + * Makefile.am: Changes to allow parallel make runs. + 2006-09-12 Werner Koch <[email protected]> Replaced all call gpg_error_from_errno(errno) by diff --git a/tools/Makefile.am b/tools/Makefile.am index 702bd5187..3024de301 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -51,6 +51,7 @@ endif 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 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c # 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 @@ gpgkey2ssh_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \ $(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) + |