Removed picnic merge target.

This commit is contained in:
Christian Paquin 2018-02-15 20:34:04 -05:00
parent baabaf7772
commit 38978b090c

View File

@ -12,7 +12,7 @@ CLANGFORMAT ?= clang-format-3.9
SUBDIRS = ${SRCDIR}
BUILT_SOURCES = links
lib_LTLIBRARIES = liboqs.la libmerge_external.la
lib_LTLIBRARIES = liboqs.la
liboqs_la_SOURCES =
liboqs_la_LIBADD = src/common/libcommon.la
liboqs_la_LIBADD += src/crypto/aes/libaes.la
@ -93,13 +93,6 @@ if USE_SIDH_IQC
cp src/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h $(includedir)/oqs
endif
libmerge_external.la:
if USE_SIG_PICNIC
mkdir -p temp && cp liboqs.a temp/ && cp src/sig_picnic/external/build/libpicnic_static.a temp/
cd temp && ar x liboqs.a && ar x libpicnic_static.a && ar cr liboqs.a *.o && ranlib liboqs.a && mv liboqs.a ../.libs
cd .. && rm -rf temp
endif
noinst_bin_PROGRAMS = test_kex test_aes test_rand
if USE_KEX_LWE_FRODO
noinst_bin_PROGRAMS += minimal_kex_oqs