* keyserver.c (curl_can_handle): New. Do a runtime check against libcurl
[gnupg.git] / g10 / Makefile.am
index e289a82..9e50eeb 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.
 #
@@ -15,7 +15,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
@@ -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          \
@@ -55,7 +62,6 @@ common_source =  \
              keyid.c           \
              packet.h          \
              parse-packet.c    \
-             comment.c         \
              status.c          \
              status.h          \
              plaintext.c       \
@@ -71,7 +77,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 cardclue.h
+card_support_source_local = cardglue.c cardglue.h tlv.c tlv.h
 else
 card_support_source_g10 =
 card_support_source_scd = 
@@ -117,16 +123,9 @@ 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@ @LIBCURL@
+##gpg_CPPFLAGS = @LIBCURL_CPPFLAGS@
 
 $(PROGRAMS): $(needed_libs)
 
@@ -142,12 +141,15 @@ install-data-local:
 
 # Helper to update some source files.
 update-source-from-gnupg-2:
-       test -d ../../gnupg-1.9/scd
-       @for i in $(card_support_source_scd); do \
-           cp ../../gnupg-1.9/scd/$$i $$i; echo $$i; \
-       done
-       @for i in $(card_support_source_g10); do \
-           cp ../../gnupg-1.9/g10/$$i $$i; echo $$i; \
-       done
-       @echo "Please remember to update the ChangeLog accordingly!"
-
+       @set -e; \
+        if test -d ../../gnupg-1.9/scd; then dir="../../gnupg-1.9"; \
+        elif test -d ../../gnupg/scd; then dir="../../gnupg"; \
+        else exit 1; \
+        fi; \
+        for i in $(card_support_source_scd); do \
+           cp $$dir/scd/$$i $$i; echo $$i; \
+        done ;\
+        for i in $(card_support_source_g10); do \
+           cp $$dir/g10/$$i $$i; echo $$i; \
+        done ; \
+        echo "Please remember to update the ChangeLog accordingly!"