diff options
| author | Jelmer Vernooij <jelmer@jelmer.uk> | 2016-05-15 19:38:46 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@jelmer.uk> | 2016-05-15 19:38:46 +0000 |
| commit | 6a4d0fe03aa5b86d10553ff789aef231afade301 (patch) | |
| tree | f4d87185c319c8fe2d3387a08159ecd8b6b2cabe /lib/hcrypto/Makefile.am | |
| parent | 30644adf6a9966d6405d1f4a9789dee921496db0 (diff) | |
| parent | b05adcb637201afe0306265208ece1772ca2eb8b (diff) | |
Merge tag 'upstream/1.7_git20160515+dfsg' into experimental
Upstream version 1.7~git20160515+dfsg
Diffstat (limited to 'lib/hcrypto/Makefile.am')
| -rw-r--r-- | lib/hcrypto/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am index d2bb42494..a67b683ce 100644 --- a/lib/hcrypto/Makefile.am +++ b/lib/hcrypto/Makefile.am @@ -2,8 +2,10 @@ include $(top_srcdir)/Makefile.am.common +AUTOMAKE_OPTIONS = subdir-objects + if HAVE_HCRYPTO_W_OPENSSL -AM_CPPFLAGS += -I$(INCLUDE_openssl_crypto) +AM_CPPFLAGS += $(INCLUDE_openssl_crypto) endif AM_CPPFLAGS += -I$(top_srcdir)/lib/hx509 \ @@ -99,7 +101,7 @@ check_SCRIPTS = $(SCRIPT_TESTS) TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS) -LDADD = $(lib_LTLIBRARIES) $(LIB_roken) +LDADD = $(lib_LTLIBRARIES) $(LIB_roken) $(LIB_openssl_crypto) test_rand_LDADD = $(LDADD) -lm libhcrypto_la_SOURCES = \ |