diff options
Diffstat (limited to 'g10/Makefile.am')
| -rw-r--r-- | g10/Makefile.am | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index ea4afc878..0c53eab97 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -25,9 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am -# We need KSBA_CFLAGS because that is included by keybox.h. See also -# comments below for libksba. -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \ +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) needed_libs = ../kbx/libkeybox.a $(libcommon) @@ -140,17 +138,14 @@ gpgv2_SOURCES = gpgv.c \ # ks-db.h \ # $(common_source) -# FIXME: Libkeybox.a links to libksba thus we need to add libksba -# here, even that it is not used by gpg. A proper solution would -# either to split up libkeybox.a or to use a separate keybox daemon. LDADD = $(needed_libs) ../common/libgpgrl.a \ $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS) gpg2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \ - $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ $(LIBICONV) $(resource_objs) $(extra_sys_libs) gpg2_LDFLAGS = $(extra_bin_ldflags) gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \ - $(KSBA_LIBS) $(GPG_ERROR_LIBS) \ + $(GPG_ERROR_LIBS) \ $(LIBICONV) $(resource_objs) $(extra_sys_libs) gpgv2_LDFLAGS = $(extra_bin_ldflags) |