aboutsummaryrefslogtreecommitdiffstats
path: root/g10/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'g10/Makefile.am')
-rw-r--r--g10/Makefile.am13
1 files changed, 4 insertions, 9 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 06d09483e..4727d0a8a 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -18,7 +18,7 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
EXTRA_DIST = options.skel
# it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h
@@ -26,7 +26,7 @@ libexecdir = @libexecdir@/@PACKAGE@
if ! HAVE_DOSISH_SYSTEM
AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
endif
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@
+needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
#noinst_PROGRAMS = gpgd
bin_PROGRAMS = gpg gpgv
@@ -96,15 +96,10 @@ gpg_SOURCES = g10.c \
photoid.c photoid.h \
exec.c exec.h
-
-
gpgv_SOURCES = gpgv.c \
$(common_source) \
verify.c
-
-
-
#gpgd_SOURCES = gpgd.c \
# ks-proto.h \
# ks-proto.c \
@@ -112,9 +107,9 @@ gpgv_SOURCES = gpgv.c \
# ks-db.h \
# $(common_source)
-LDADD = $(needed_libs) @ZLIBS@ @INTLLIBS@
+LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@
# gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it
-gpg_LDADD = @LIBOBJS@ $(LDADD) @NETLIBS@
+gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@
$(PROGRAMS): $(needed_libs)