diff options
| author | Werner Koch <wk@gnupg.org> | 2006-10-23 16:02:13 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-10-23 16:02:13 +0200 |
| commit | 7b8ea82ab64aa0c298c48ef3edf680102c2b1788 (patch) | |
| tree | 3dfca78f29a4bdbd5ae307ca989544b951fe091d /keyserver | |
| parent | Allow importing of web.de generated p12 files (diff) | |
| download | gnupg2-7b8ea82ab64aa0c298c48ef3edf680102c2b1788.tar.xz gnupg2-7b8ea82ab64aa0c298c48ef3edf680102c2b1788.zip | |
.
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/Makefile.am | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index a8837f58b..fac34ff38 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2006-10-20 Werner Koch <wk@g10code.com> + + * Makefile.am: Reporder macros for better readability. + (gpg2keys_finger_LDADD): Add GPG_ERROR_LIBS. + 2006-10-19 David Shaw <dshaw@jabberwocky.com> * gpgkeys_hkp.c (curl_mrindex_writer): Print a warning if we see diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index d72da1406..fd86fa168 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -40,18 +40,17 @@ 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 -gpg2keys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h no-libgcrypt.c -gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c -gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c - - gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS) -gpg2keys_ldap_LDADD = $(LDAPLIBS) $(NETLIBS) \ - $(other_libs) +gpg2keys_ldap_LDADD = $(LDAPLIBS) $(NETLIBS) $(other_libs) -gpg2keys_finger_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) \ +gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c +gpg2keys_ldap_CPPFLAGS = $(AM_CPPFLAGS) +gpg2keys_finger_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \ $(NETLIBS) $(other_libs) + +gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c +gpg2keys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h no-libgcrypt.c if FAKE_CURL gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS) |