diff options
| author | Jonas Witschel <diabonas@gmx.de> | 2019-05-19 17:38:27 +0200 |
|---|---|---|
| committer | Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de> | 2019-05-21 18:18:05 +0200 |
| commit | 71ab0123a2609ed93ee9c3e3512ce2cbb01ecd3b (patch) | |
| tree | 93a087c2a59c6c887abb188e323a4c001c931f2c /Makefile.am | |
| parent | 84aef1ad1e3ddf0552034b459a0bbbe498d4c4ed (diff) | |
| download | tpm2-tss-71ab0123a2609ed93ee9c3e3512ce2cbb01ecd3b.tar.gz | |
build: use unified TSS2_ESYS_{C,LD}FLAGS_CRYPTO for crypto backend
Simplifies the Makefiles a bit and will make it easier to specify the
correct dependencies in pkg-config files.
Signed-off-by: Jonas Witschel <diabonas@gmx.de>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 7ac68e39..e8d1de46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,19 +309,15 @@ src_tss2_esys_libtss2_esys_la_LIBADD = $(libtss2_sys) $(libtss2_mu) \ if ESYS_OSSL TSS2_ESYS_SRC_CRYPTO = src/tss2-esys/esys_crypto_ossl.h src/tss2-esys/esys_crypto_ossl.c -src_tss2_esys_libtss2_esys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-esys -DOSSL \ - $(LIBCRYPTO_CFLAGS) -src_tss2_esys_libtss2_esys_la_LDFLAGS = $(AM_LDFLAGS) $(LIBDL_LDFLAGS) $(LIBSOCKET_LDFLAGS) \ - $(LIBCRYPTO_LIBS) -Wl,--version-script=$(srcdir)/lib/tss2-esys.map else if ESYS_GCRYPT TSS2_ESYS_SRC_CRYPTO = src/tss2-esys/esys_crypto_gcrypt.h src/tss2-esys/esys_crypto_gcrypt.c -src_tss2_esys_libtss2_esys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-esys -src_tss2_esys_libtss2_esys_la_LDFLAGS = $(AM_LDFLAGS) $(LIBDL_LDFLAGS) $(LIBSOCKET_LDFLAGS) \ - -lgcrypt -Wl,--version-script=$(srcdir)/lib/tss2-esys.map endif endif +src_tss2_esys_libtss2_esys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-esys $(TSS2_ESYS_CFLAGS_CRYPTO) +src_tss2_esys_libtss2_esys_la_LDFLAGS = $(AM_LDFLAGS) $(LIBDL_LDFLAGS) $(LIBSOCKET_LDFLAGS) \ + $(TSS2_ESYS_LDFLAGS_CRYPTO) -Wl,--version-script=$(srcdir)/lib/tss2-esys.map src_tss2_esys_libtss2_esys_la_SOURCES = $(TSS2_ESYS_SRC) $(TSS2_ESYS_SRC_CRYPTO) EXTRA_DIST += lib/tss2-esys.map lib/tss2-esys.def src/tss2-esys/tss2-esys.vcxproj endif #ESAPI |