mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-02 12:01:32 +01:00
build: Fix several "include file not found" problems
* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add KSBA_CFLAGS. * kbx/Makefile.am (libkeybox_a_CFLAGS, libkeybox509_a_CFLAGS): Add NPTH_CFLAGS. * tools/Makefile.am (gpgtar_CFLAGS, gpg_wks_server_CFLAGS, gpg_wks_client_CFLAGS, gpg_pair_tool_CFLAGS): Add LIBGCRYPT_CFLAGS. -- The tools include gcrypt.h via common/util.h. GnuPG-bug-id: 5592
This commit is contained in:
parent
548ff03983
commit
e2069d5632
@ -163,7 +163,7 @@ t_ldap_parse_uri_SOURCES = \
|
||||
$(ldap_url) $(t_common_src)
|
||||
t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \
|
||||
$(LIBGCRYPT_CFLAGS) \
|
||||
$(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
|
||||
$(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
|
||||
t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
|
||||
|
||||
t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
|
||||
|
@ -65,8 +65,8 @@ client_sources = \
|
||||
libkeybox_a_SOURCES = $(common_sources) $(client_sources)
|
||||
libkeybox509_a_SOURCES = $(common_sources) $(client_sources)
|
||||
|
||||
libkeybox_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
|
||||
libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DKEYBOX_WITH_X509=1
|
||||
libkeybox_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
|
||||
libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) -DKEYBOX_WITH_X509=1
|
||||
|
||||
|
||||
# We need W32SOCKLIBS because the init subsystem code in libcommon
|
||||
|
@ -162,7 +162,7 @@ gpgtar_SOURCES = \
|
||||
gpgtar-create.c \
|
||||
gpgtar-extract.c \
|
||||
gpgtar-list.c
|
||||
gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS)
|
||||
gpgtar_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
|
||||
gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
|
||||
$(gpgtar_rc_objs)
|
||||
@ -177,7 +177,7 @@ gpg_wks_server_SOURCES = \
|
||||
mime-maker.c mime-maker.h \
|
||||
send-mail.c send-mail.h
|
||||
|
||||
gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
gpg_wks_server_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBINTL) $(LIBICONV)
|
||||
|
||||
@ -192,7 +192,8 @@ gpg_wks_client_SOURCES = \
|
||||
send-mail.c send-mail.h \
|
||||
call-dirmngr.c call-dirmngr.h
|
||||
|
||||
gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(LIBGCRYPT_CFLAGS) \
|
||||
$(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
gpg_wks_client_LDADD = $(libcommon) \
|
||||
$(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBINTL) $(LIBICONV) $(NETLIBS) \
|
||||
@ -201,7 +202,7 @@ gpg_wks_client_LDADD = $(libcommon) \
|
||||
gpg_pair_tool_SOURCES = \
|
||||
gpg-pair-tool.c
|
||||
|
||||
gpg_pair_tool_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
gpg_pair_tool_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
gpg_pair_tool_LDADD = $(libcommon) \
|
||||
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
|
||||
|
Loading…
x
Reference in New Issue
Block a user