Finished support for v2 cards with the exception of secure messaging.
[gnupg.git] / g10 / Makefile.am
index 580ac76..ff50812 100644 (file)
@@ -5,7 +5,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.
 # 
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
@@ -29,15 +27,22 @@ include $(top_srcdir)/am/cmacros.am
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
-needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
+needed_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a 
 
 bin_PROGRAMS = gpg2 gpgv2
 
+if ENABLE_BZIP2_SUPPORT
+bzip2_source = compress-bz2.c
+else
+bzip2_source =
+endif
+
+
 common_source =  \
              gpg.h             \
              build-packet.c    \
              compress.c        \
-             compress-bz2.c    \
+             $(bzip2_source)   \
              filter.h          \
              free-packet.c     \
              getkey.c          \
@@ -57,14 +62,14 @@ common_source =  \
              keyid.c           \
              packet.h          \
              parse-packet.c    \
-             status.c          \
-             status.h          \
+             cpr.c             \
              plaintext.c       \
              sig-check.c       \
              keylist.c         \
              pkglue.c pkglue.h 
 
 gpg2_SOURCES  = gpg.c          \
+             server.c          \
              $(common_source)  \
              pkclist.c         \
              skclist.c         \
@@ -110,9 +115,11 @@ gpgv2_SOURCES = gpgv.c           \
 
 LDADD =  $(needed_libs) ../common/libgpgrl.a \
          $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \
-         $(LIBINTL) $(CAPLIBS) $(W32LIBS)
-gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
-gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
+         $(LIBINTL) $(CAPLIBS) $(NETLIBS)
+gpg2_LDADD =  $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
+            $(LIBICONV)
+gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
+             $(LIBICONV)
 
 $(PROGRAMS): $(needed_libs) ../common/libgpgrl.a