Imported Upstream version 2.2.37

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

diff --git a/common/Makefile.am b/common/Makefile.am
index d09f0df..bd281d6 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -14,20 +14,25 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
              audit-events.h status-codes.h ChangeLog.jnlib \
-            ChangeLog-2011.include w32info-rc.h.in gnupg.ico
+            ChangeLog-2011.include w32info-rc.h.in gnupg.ico \
+            all-tests.scm
 
 noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a
 if !HAVE_W32CE_SYSTEM
 noinst_LIBRARIES += libsimple-pwquery.a
 endif
 noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
+if DISABLE_TESTS
+TESTS =
+else
 TESTS = $(module_tests)
+endif
 
 BUILT_SOURCES = audit-events.h status-codes.h
 
@@ -42,7 +47,7 @@ include $(top_srcdir)/am/cmacros.am
 
 common_sources = \
        common-defs.h \
-       util.h fwddecl.h i18n.c i18n.h \
+       util.h utilproto.h fwddecl.h i18n.c i18n.h \
        types.h host2net.h dynload.h w32help.h \
        mapstrings.c stringhelp.c stringhelp.h \
        strlist.c strlist.h \
@@ -55,9 +60,8 @@ common_sources = \
        shareddefs.h \
        openpgpdefs.h \
        gc-opt-flags.h \
-       keyserver.h \
        sexp-parse.h \
-       tlv.c tlv.h \
+       tlv.c tlv.h tlv-builder.c \
        init.c init.h \
        sexputil.c \
        sysutils.c sysutils.h \
@@ -72,6 +76,7 @@ common_sources = \
        xasprintf.c \
        xreadline.c \
        membuf.c membuf.h \
+       ccparray.c ccparray.h \
        iobuf.c iobuf.h \
        ttyio.c ttyio.h \
        asshelp.c asshelp2.c asshelp.h \
@@ -87,11 +92,17 @@ common_sources = \
        helpfile.c \
        mkdir_p.c mkdir_p.h \
        strlist.c strlist.h \
-       call-gpg.c call-gpg.h \
-       exectool.c exectool.h
+       exectool.c exectool.h \
+       server-help.c server-help.h \
+       name-value.c name-value.h \
+       recsel.c recsel.h \
+       ksba-io-support.c ksba-io-support.h \
+       openpgp-fpr.c \
+       compliance.c compliance.h
+
 
 if HAVE_W32_SYSTEM
-common_sources += w32-reg.c w32-afunix.c w32-afunix.h
+common_sources += w32-reg.c w32-cmdline.c
 endif
 
 # To make the code easier to read we have split home some code into
@@ -110,11 +121,14 @@ endif
 without_npth_sources = \
         get-passphrase.c get-passphrase.h
 
+# Sources only useful with NPTH.
+with_npth_sources = \
+        call-gpg.c call-gpg.h
 
 libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
 
-libcommonpth_a_SOURCES = $(common_sources)
+libcommonpth_a_SOURCES = $(common_sources) $(with_npth_sources)
 libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 
 if !HAVE_W32CE_SYSTEM
@@ -138,13 +152,13 @@ if MAINTAINER_MODE
 audit-events.h: Makefile.am mkstrtable.awk exaudit.awk audit.h
        $(AWK) -f $(srcdir)/exaudit.awk $(srcdir)/audit.h \
          | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
-                  -v namespace=eventstr_  > $(srcdir)/audit-events.h
+                  -v pkg_namespace=eventstr_  > $(srcdir)/audit-events.h
 
 # Create the status-codes.h include file from status.h
 status-codes.h: Makefile.am mkstrtable.awk exstatus.awk status.h
        $(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
          | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
-                  -v namespace=statusstr_  > $(srcdir)/status-codes.h
+                  -v pkg_namespace=statusstr_  > $(srcdir)/status-codes.h
 endif
 
 #
@@ -153,9 +167,10 @@ endif
 module_tests = t-stringhelp t-timestuff \
                t-convert t-percent t-gettime t-sysutils t-sexputil \
               t-session-env t-openpgp-oid t-ssh-utils \
-              t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist
+              t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
+              t-name-value t-ccparray t-recsel t-w32-cmdline
 if !HAVE_W32CE_SYSTEM
-module_tests += t-exechelp
+module_tests += t-exechelp t-exectool
 endif
 if HAVE_W32_SYSTEM
 module_tests += t-w32-reg
@@ -170,10 +185,10 @@ endif
 t_extra_src = t-support.h
 
 t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \
-                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 t_common_ldadd = libcommon.a \
                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-                $(LIBINTL) $(LIBICONV)
+                $(LIBINTL) $(LIBICONV) $(NETLIBS)
 
 
 # Common tests
@@ -191,6 +206,7 @@ t_helpfile_LDADD = $(t_common_ldadd)
 t_sexputil_LDADD = $(t_common_ldadd)
 t_b64_LDADD = $(t_common_ldadd)
 t_exechelp_LDADD = $(t_common_ldadd)
+t_exectool_LDADD = $(t_common_ldadd)
 t_session_env_LDADD = $(t_common_ldadd)
 t_openpgp_oid_LDADD = $(t_common_ldadd)
 t_ssh_utils_LDADD = $(t_common_ldadd)
@@ -202,6 +218,12 @@ t_zb32_LDADD = $(t_common_ldadd)
 t_mbox_util_LDADD = $(t_common_ldadd)
 t_iobuf_LDADD = $(t_common_ldadd)
 t_strlist_LDADD = $(t_common_ldadd)
+t_name_value_LDADD = $(t_common_ldadd)
+t_ccparray_LDADD = $(t_common_ldadd)
+t_recsel_LDADD = $(t_common_ldadd)
+
+t_w32_cmdline_SOURCES = t-w32-cmdline.c w32-cmdline.c $(t_extra_src)
+t_w32_cmdline_LDADD = $(t_common_ldadd)
 
 # System specific test
 if HAVE_W32_SYSTEM