po: Update Japanese Translation.
[gnupg.git] / tools / Makefile.am
index c07a8b1..fb37c05 100644 (file)
@@ -20,25 +20,23 @@ EXTRA_DIST = \
        Manifest watchgnupg.c no-libgcrypt.c \
        addgnupghome applygnupgdefaults \
        lspgpot mail-signed-keys convert-from-106 sockprox.c \
-       ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
+       ccidmon.c ChangeLog-2011 \
+       gpg-connect-agent-w32info.rc \
+       gpg-card-w32info.rc
 
-
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
-resource_objs += gpg-connect-agent-w32info.o
+gpg_connect_agent_rc_objs = gpg-connect-agent-w32info.o
+gpg_card_tool_rc_objs     = gpg-card-w32info.o
+resource_objs += $(gpg_connect_agent_rc_objs) $(gpg_card_tool_rc_objs)
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
 
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 
-if HAVE_USTAR
-# bin_SCRIPTS += gpg-zip
-noinst_SCRIPTS = gpg-zip
-endif
-
 if BUILD_SYMCRYPTRUN
   symcryptrun = symcryptrun
 else
@@ -47,18 +45,15 @@ endif
 
 if BUILD_WKS_TOOLS
   gpg_wks_server = gpg-wks-server
-  gpg_wks_client = gpg-wks-client
 else
   gpg_wks_server =
-  gpg_wks_client =
 endif
 
-libexec_PROGRAMS =
+libexec_PROGRAMS = gpg-wks-client gpg-pair-tool
 
-bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
+bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun}
 if !HAVE_W32_SYSTEM
 bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server}
-libexec_PROGRAMS += ${gpg_wks_client}
 endif
 
 if !DISABLE_REGEX
@@ -66,7 +61,7 @@ libexec_PROGRAMS += gpg-check-pattern
 endif
 
 if !HAVE_W32CE_SYSTEM
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat make-dns-cert gpgsplit
 endif
 
 if !HAVE_W32CE_SYSTEM
@@ -126,7 +121,23 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
                          $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
                           $(GPG_ERROR_LIBS) \
                           $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-                          $(resource_objs)
+                          $(gpg_connect_agent_rc_objs)
+
+
+gpg_card_SOURCES   = \
+       gpg-card.c \
+       gpg-card.h     \
+       card-call-scd.c \
+       card-keys.c \
+       card-yubikey.c \
+       card-misc.c
+
+gpg_card_LDADD = \
+       ../common/libgpgrl.a $(common_libs) \
+       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
+       $(GPG_ERROR_LIBS) \
+        $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
+        $(gpg_card_tool_rc_objs)
 
 
 if !DISABLE_REGEX
@@ -158,7 +169,7 @@ gpg_wks_server_SOURCES = \
 
 gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-                      $(LIBICONV)
+                      $(LIBINTL) $(LIBICONV)
 
 gpg_wks_client_SOURCES = \
        gpg-wks-client.c \
@@ -174,7 +185,15 @@ gpg_wks_client_SOURCES = \
 gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_client_LDADD = $(libcommon) \
                       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-                      $(LIBICONV)
+                      $(LIBINTL) $(LIBICONV)
+
+gpg_pair_tool_SOURCES = \
+       gpg-pair-tool.c
+
+gpg_pair_tool_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
+gpg_pair_tool_LDADD =  $(libcommon) \
+                      $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+                      $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
 
 
 # Make sure that all libs are build before we use them.  This is