* mainproc.c (symkey_decrypt_seskey): There is no need to have an
[gnupg.git] / g10 / Makefile.am
index 730039e..2c8bc9a 100644 (file)
@@ -1,5 +1,5 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002,
-#               200 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -23,19 +23,26 @@ 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
-libexecdir = @libexecdir@/@PACKAGE@
+
 if ! HAVE_DOSISH_SYSTEM
-AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
+AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
 endif
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 
-#noinst_PROGRAMS = gpgd
 bin_PROGRAMS = gpg gpgv
 
+if ENABLE_BZIP2_SUPPORT
+bzip2_source = compress-bz2.c
+else
+bzip2_source =
+endif
+
 common_source =  \
              global.h          \
              build-packet.c    \
              compress.c        \
+             $(bzip2_source)   \
              filter.h          \
              free-packet.c     \
              getkey.c          \
@@ -71,7 +78,7 @@ card_support_source_scd = \
        iso7816.c iso7816.h \
        apdu.c apdu.h \
        ccid-driver.c ccid-driver.h
-card_support_source_local = cardglue.c cardglue.h
+card_support_source_local = cardglue.c cardglue.h tlv.c tlv.h
 else
 card_support_source_g10 =
 card_support_source_scd = 
@@ -117,16 +124,8 @@ gpgv_SOURCES = gpgv.c           \
              $(common_source)  \
              verify.c          
 
-#gpgd_SOURCES = gpgd.c \
-#             ks-proto.h \
-#             ks-proto.c \
-#             ks-db.c \
-#             ks-db.h \
-#             $(common_source)
-
-LDADD =  $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@
-# gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it
-gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@
+LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
+gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
 
 $(PROGRAMS): $(needed_libs)
 
@@ -154,4 +153,3 @@ update-source-from-gnupg-2:
            cp $$dir/g10/$$i $$i; echo $$i; \
         done ; \
         echo "Please remember to update the ChangeLog accordingly!"
-