projects / platform / upstream / gnutls.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Imported Upstream version 3.3.5
[platform/upstream/gnutls.git] / lib / Makefile.am
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 693af1f..4daa19d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,14 +20,18 @@
 
 ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
 
-SUBDIRS = includes x509 accelerated auth ext algorithms extras
+EXTRA_DIST = priority_options.gperf
+BUILT_SOURCES = pkix_asn1_tab.c gnutls_asn1_tab.c priority_options.h
+
+SUBDIRS = includes x509 auth ext algorithms extras accelerated
+
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif
 
 localedir = $(datadir)/locale
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
+AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
 AM_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\"            \
        -I$(srcdir)/../gl                       \
@@ -37,6 +41,7 @@ AM_CPPFLAGS = \
        -I$(srcdir)/includes                    \
        -I$(builddir)/includes                  \
        -I$(srcdir)/x509                        \
+       $(LIBTASN1_CFLAGS)                      \
        $(P11_KIT_CFLAGS)
 
 if ENABLE_OPENPGP
@@ -60,7 +65,8 @@ SRP_COBJECTS = gnutls_srp.c
 
 PSK_COBJECTS = gnutls_psk.c
 
-COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c   \
+COBJECTS = gnutls_range.c gnutls_record.c \
+       gnutls_compress.c debug.c gnutls_cipher.c       \
        gnutls_mbuffers.c gnutls_buffers.c gnutls_handshake.c           \
        gnutls_num.c gnutls_errors.c gnutls_dh.c gnutls_kx.c            \
        gnutls_priority.c gnutls_hash_int.c gnutls_cipher_int.c         \
@@ -68,16 +74,23 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c        \
        gnutls_auth.c gnutls_v2_compat.c gnutls_datum.c                 \
        gnutls_session_pack.c gnutls_mpi.c gnutls_pk.c gnutls_cert.c    \
        gnutls_global.c gnutls_constate.c gnutls_anon_cred.c            \
-       pkix_asn1_tab.c gnutls_asn1_tab.c gnutls_mem.c gnutls_ui.c      \
-       gnutls_sig.c gnutls_ecc.c gnutls_dh_primes.c gnutls_alert.c     \
+       pkix_asn1_tab.c gnutls_asn1_tab.c                               \
+       gnutls_mem.c gnutls_ui.c vasprintf.c vasprintf.h                \
+       gnutls_sig.c gnutls_ecc.c gnutls_alert.c gnutls_privkey_raw.c   \
        system.c gnutls_str.c gnutls_state.c gnutls_x509.c              \
        gnutls_rsa_export.c gnutls_helper.c gnutls_supplemental.c       \
        random.c crypto-api.c gnutls_privkey.c gnutls_pcert.c           \
-       gnutls_pubkey.c locks.c hash.c gnutls_dtls.c system_override.c  \
-       crypto-backend.c verify-tofu.c
+       gnutls_pubkey.c locks.c gnutls_dtls.c system_override.c \
+       crypto-backend.c verify-tofu.c pin.c tpm.c fips.c \
+       safe-memset.c
+
+if ENABLE_SELF_CHECKS
+COBJECTS += crypto-selftests.c crypto-selftests-pk.c
+endif
 
 if ENABLE_PKCS11
-COBJECTS += pkcs11.c pkcs11_privkey.c pkcs11_write.c pkcs11_secret.c
+COBJECTS += pkcs11.c pkcs11_privkey.c pkcs11_write.c pkcs11_secret.c \
+       pkcs11_int.c
 endif
 
 if ENABLE_NETTLE
@@ -94,9 +107,10 @@ HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h   \
        gnutls_constate.h gnutls_global.h gnutls_sig.h gnutls_mem.h     \
        gnutls_session_pack.h gnutls_str.h gnutls_str_array.h           \
        gnutls_state.h gnutls_x509.h crypto-backend.h                   \
-       gnutls_rsa_export.h gnutls_srp.h auth/srp.h auth/srp_passwd.h   \
+       gnutls_srp.h auth/srp.h auth/srp_passwd.h       \
        gnutls_helper.h gnutls_supplemental.h crypto.h random.h system.h\
-       locks.h gnutls_mbuffers.h hash.h gnutls_ecc.h
+       locks.h gnutls_mbuffers.h gnutls_ecc.h pin.h fips.h \
+       priority_options.h
 
 if ENABLE_PKCS11
 HFILES += pkcs11_int.h
@@ -112,11 +126,27 @@ libgnutls_la_LDFLAGS = -no-undefined \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
-       accelerated/libaccelerated.la ext/libgnutls_ext.la \
+       ext/libgnutls_ext.la \
        auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
-       extras/libgnutls_extras.la \
-       $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
-       $(LTLIBPTHREAD) $(P11_KIT_LIBS) $(LIB_SELECT)
+       extras/libgnutls_extras.la
+thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) \
+       $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS)
+
+if ENABLE_NETTLE
+libgnutls_la_LIBADD += accelerated/libaccelerated.la
+endif
+
+if !WINDOWS
+thirdparty_libadd += $(LTLIBPTHREAD)
+endif
+
+if NEEDS_LIBRT
+thirdparty_libadd += $(LTLIBRT)
+endif
+
+if ENABLE_FIPS140
+thirdparty_libadd += $(FIPS140_LIBS)
+endif
 
 if ENABLE_OPENPGP
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la
@@ -132,18 +162,14 @@ endif
 if ENABLE_MINITASN1
 libgnutls_la_LIBADD += minitasn1/libminitasn1.la
 else
-libgnutls_la_LDFLAGS += $(LTLIBTASN1)
+thirdparty_libadd += $(LIBTASN1_LIBS)
 endif
 
 if ENABLE_NETTLE
-libgnutls_la_LDFLAGS += $(LTLIBNETTLE)
+thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
 libgnutls_la_LIBADD += nettle/libcrypto.la
 endif
 
-if WINDOWS
-libgnutls_la_LDFLAGS += -lcrypt32
-endif
-
 if HAVE_LD_OUTPUT_DEF
 libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(DLL_VERSION).def
 libgnutls-$(DLL_VERSION).def: libgnutls.la
@@ -152,6 +178,12 @@ defexec_DATA = libgnutls-$(DLL_VERSION).def
 DISTCLEANFILES += $(defexec_DATA)
 endif
 
+if WINDOWS
+thirdparty_libadd += -lcrypt32
+endif
+
+libgnutls_la_LIBADD += $(thirdparty_libadd)
+
 # C++ library
 
 if ENABLE_CXX
@@ -163,20 +195,21 @@ AM_CXXFLAGS = \
 
 lib_LTLIBRARIES += libgnutlsxx.la
 
-libgnutlsxx_la_SOURCES = gnutlsxx.cpp libgnutlsxx.map
+libgnutlsxx_la_SOURCES = gnutlsxx.cpp
 
 libgnutlsxx_la_LDFLAGS = -no-undefined \
        -version-info $(CXX_LT_CURRENT):$(CXX_LT_REVISION):$(CXX_LT_AGE)
 
 libgnutlsxx_la_LIBADD = libgnutls.la
 
-if HAVE_LD_VERSION_SCRIPT
-libgnutlsxx_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libgnutlsxx.map
-endif
 endif
 
-pkix_asn1_tab.c: pkix.asn
-       -asn1Parser pkix.asn pkix_asn1_tab.c
+pkix_asn1_tab.c: $(srcdir)/pkix.asn
+       -asn1Parser $(srcdir)/pkix.asn pkix_asn1_tab.c
+
+gnutls_asn1_tab.c: $(srcdir)/gnutls.asn
+       -asn1Parser $(srcdir)/gnutls.asn gnutls_asn1_tab.c
+
+priority_options.h: $(srcdir)/priority_options.gperf
+       -gperf -t $^ > $@-tmp && mv $@-tmp $@
 
-gnutls_asn1_tab.c: gnutls.asn
-       -asn1Parser gnutls.asn gnutls_asn1_tab.c
Domain: Security / Utilities;