Make tests and bench just use asm directly instead of library

Thanks to Cory Fields for the suggestion.
pull/11871/head
Pieter Wuille 10 years ago
parent 8a0ee2357a
commit 8881212ebc

@ -1,9 +1,7 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
INCLUDES = $(SECP_INCLUDES) INCLUDES = $(SECP_INCLUDES)
lib_LTLIBRARIES = libsecp256k1.la lib_LTLIBRARIES = libsecp256k1.la
libsecp256k1_la_SOURCES = src/secp256k1.c noinst_LTLIBRARIES = libsecp256k1_common.la
libsecp256k1_la_CPPFLAGS = -I$(top_srcdir)/include $(SECP_INCLUDES)
libsecp256k1_la_LIBADD = $(SECP_LIBS)
include_HEADERS = include/secp256k1.h include_HEADERS = include/secp256k1.h
noinst_HEADERS = noinst_HEADERS =
noinst_HEADERS += src/group.h noinst_HEADERS += src/group.h
@ -35,16 +33,21 @@ noinst_HEADERS += src/field_impl.h
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libsecp256k1.pc pkgconfig_DATA = libsecp256k1.pc
libsecp256k1_common_la_SOURCES =
if USE_ASM if USE_ASM
libsecp256k1_la_SOURCES += src/field_5x52_asm.asm libsecp256k1_common_la_SOURCES += src/field_5x52_asm.asm
endif endif
libsecp256k1_la_SOURCES = src/secp256k1.c
libsecp256k1_la_CPPFLAGS = -I$(top_srcdir)/include $(SECP_INCLUDES)
libsecp256k1_la_LIBADD = libsecp256k1_common.la $(SECP_LIBS)
noinst_PROGRAMS = noinst_PROGRAMS =
if USE_BENCHMARK if USE_BENCHMARK
noinst_PROGRAMS += bench noinst_PROGRAMS += bench
bench_SOURCES = src/bench.c bench_SOURCES = src/bench.c
bench_CPPFLAGS = -DNDEBUG bench_CPPFLAGS = -DNDEBUG
bench_LDADD = libsecp256k1.la $(SECP_LIBS) bench_LDADD = libsecp256k1_common.la $(SECP_LIBS)
bench_LDFLAGS = -static bench_LDFLAGS = -static
endif endif
@ -52,7 +55,7 @@ if USE_TESTS
noinst_PROGRAMS += tests noinst_PROGRAMS += tests
tests_SOURCES = src/tests.c tests_SOURCES = src/tests.c
tests_CPPFLAGS = -DVERIFY $(SECP_TEST_INCLUDES) tests_CPPFLAGS = -DVERIFY $(SECP_TEST_INCLUDES)
tests_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS) tests_LDADD = libsecp256k1_common.la $(SECP_LIBS) $(SECP_TEST_LIBS)
tests_LDFLAGS = -static tests_LDFLAGS = -static
TESTS = tests TESTS = tests
endif endif

Loading…
Cancel
Save