Imported Upstream version 2.2.22

[platform/upstream/gpg2.git] / g13 / Makefile.am

diff --git a/g13/Makefile.am b/g13/Makefile.am
index c0e7a71..ef5671f 100644 (file)
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -18,15 +18,19 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ChangeLog-2011
+EXTRA_DIST = ChangeLog-2011 all-tests.scm
 
 bin_PROGRAMS = g13
 sbin_PROGRAMS = g13-syshelp
 
 noinst_PROGRAMS = $(module_tests)
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = $(module_tests)
+endif
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
@@ -70,7 +74,7 @@ g13_syshelp_LDADD = $(libcommon) \
 
 module_tests = t-g13tuple
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) \
-                $(LIBASSUAN_LIBS)
+                $(LIBASSUAN_LIBS) $(LIBICONV)
 
 t_g13tuple_SOURCES = t-g13tuple.c g13tuple.c
 t_g13tuple_LDADD = $(t_common_ldadd)