diff options
| author | Werner Koch <wk@gnupg.org> | 2017-03-02 18:17:58 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-03-02 18:35:03 +0100 |
| commit | 1890896fe698c55d15160a53aa6c5c22dc424031 (patch) | |
| tree | f1cd8640391dea35ac52eef5e54561bd26b838af /dirmngr/Makefile.am | |
| parent | dirmngr: Let --gpgconf-list return the default keyserver. (diff) | |
| download | gnupg2-1890896fe698c55d15160a53aa6c5c22dc424031.tar.xz gnupg2-1890896fe698c55d15160a53aa6c5c22dc424031.zip | |
dirmngr: Rearrange files to fix de6d831.
* dirmngr/http-common.c: New.
* dirmngr/http-common.h: New.
* dirmngr/Makefile.am (dirmngr_SOURCES): Add them.
(t_http_SOURCES): Add them.
(t_ldap_parse_uri_SOURCES): Add them.
* dirmngr/misc.c (get_default_keyserver): Move to ...
* dirmngr/http-common.c: here.
* dirmngr/http.c: Include http-common.h instead of misc.h.
* dirmngr/http-ntbtls.c: Ditto.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/Makefile.am')
| -rw-r--r-- | dirmngr/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index 8d22cc47b..93880f8ce 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -61,8 +61,7 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \ cdb.h cdblib.c misc.c dirmngr-err.h \ ocsp.c ocsp.h validate.c validate.h \ dns-stuff.c dns-stuff.h \ - http.c http.h \ - http-ntbtls.c \ + http.c http.h http-common.c http-common.h http-ntbtls.c \ ks-action.c ks-action.h ks-engine.h \ ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c @@ -141,7 +140,7 @@ endif # http tests # We need to add the KSBA flags in case we are building against GNUTLS. # In that case NTBTLS flags are empty, but we need ksba anyway. -t_http_SOURCES = $(t_common_src) t-http.c http.c dns-stuff.c +t_http_SOURCES = $(t_common_src) t-http.c http.c dns-stuff.c http-common.c t_http_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \ $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS) @@ -150,7 +149,7 @@ t_http_LDADD = $(t_common_ldadd) \ t_ldap_parse_uri_SOURCES = \ t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \ - http.c dns-stuff.c \ + http.c http-common.c dns-stuff.c \ $(ldap_url) $(t_common_src) t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) |