Imported Upstream version 2.1.14

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

diff --git a/common/Makefile.am b/common/Makefile.am
index c0df5ef..6f9d96d 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -20,10 +20,9 @@
 
 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 tls-ca.pem
+            ChangeLog-2011.include w32info-rc.h.in gnupg.ico
 
-noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a \
-                   libcommontls.a libcommontlsnpth.a
+noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a
 if !HAVE_W32CE_SYSTEM
 noinst_LIBRARIES += libsimple-pwquery.a
 endif
@@ -43,7 +42,7 @@ include $(top_srcdir)/am/cmacros.am
 
 common_sources = \
        common-defs.h \
-       util.h i18n.c i18n.h \
+       util.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 \
@@ -65,7 +64,7 @@ common_sources = \
        homedir.c \
        gettime.c gettime.h \
        yesno.c \
-       b64enc.c b64dec.c zb32.c \
+       b64enc.c b64dec.c zb32.c zb32.h \
        convert.c \
        percent.c \
        mbox-util.c mbox-util.h \
@@ -73,31 +72,32 @@ 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 \
        exechelp.h \
        signal.c \
        audit.c audit.h \
-       srv.h \
        localename.c \
        session-env.c session-env.h \
        userids.c userids.h \
        openpgp-oid.c \
        ssh-utils.c ssh-utils.h \
        agent-opt.c \
-       helpfile.c
+       helpfile.c \
+       mkdir_p.c mkdir_p.h \
+       strlist.c strlist.h \
+       call-gpg.c call-gpg.h \
+       exectool.c exectool.h \
+       server-help.c server-help.h \
+       name-value.c name-value.h \
+       recsel.c recsel.h
 
 if HAVE_W32_SYSTEM
 common_sources += w32-reg.c w32-afunix.c w32-afunix.h
 endif
 
-# Sources possible requiring a TLS library are put into a separate
-# conveince library.
-tls_sources = \
-       http.c http.h
-
-
 # To make the code easier to read we have split home some code into
 # separate source files.
 if HAVE_W32_SYSTEM
@@ -116,23 +116,11 @@ without_npth_sources = \
 
 
 libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
-if USE_DNS_SRV
-libcommon_a_SOURCES += srv.c
-endif
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
 
 libcommonpth_a_SOURCES = $(common_sources)
-if USE_DNS_SRV
-libcommonpth_a_SOURCES += srv.c
-endif
 libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 
-libcommontls_a_SOURCES = $(tls_sources)
-libcommontls_a_CFLAGS = $(AM_CFLAGS) $(LIBGNUTLS_CFLAGS) -DWITHOUT_NPTH=1
-
-libcommontlsnpth_a_SOURCES = $(tls_sources)
-libcommontlsnpth_a_CFLAGS = $(AM_CFLAGS) $(LIBGNUTLS_CFLAGS) $(NPTH_CFLAGS)
-
 if !HAVE_W32CE_SYSTEM
 libsimple_pwquery_a_SOURCES = \
        simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
@@ -169,7 +157,8 @@ 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-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
+              t-name-value t-ccparray t-recsel
 if !HAVE_W32CE_SYSTEM
 module_tests += t-exechelp
 endif
@@ -178,7 +167,7 @@ module_tests += t-w32-reg
 endif
 
 if MAINTAINER_MODE
-module_maint_tests = t-helpfile t-b64 t-http
+module_maint_tests = t-helpfile t-b64
 else
 module_maint_tests =
 endif
@@ -211,8 +200,16 @@ t_session_env_LDADD = $(t_common_ldadd)
 t_openpgp_oid_LDADD = $(t_common_ldadd)
 t_ssh_utils_LDADD = $(t_common_ldadd)
 t_mapstrings_LDADD = $(t_common_ldadd)
+
+t_zb32_SOURCES = t-zb32.c $(t_extra_src)
 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)
 
 # System specific test
 if HAVE_W32_SYSTEM
@@ -220,11 +217,5 @@ t_w32_reg_SOURCES = t-w32-reg.c $(t_extra_src)
 t_w32_reg_LDADD   = $(t_common_ldadd)
 endif
 
-# http tests
-t_http_SOURCES = t-http.c
-t_http_CFLAGS  = $(t_common_cflags) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS)
-t_http_LDADD   = libcommontls.a $(t_common_ldadd) \
-                $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
-
 # All programs should depend on the created libs.
-$(PROGRAMS) : libcommon.a libcommonpth.a libcommontls.a libcommontlsnpth.a
+$(PROGRAMS) : libcommon.a libcommonpth.a