diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-11-05 20:56:45 -0500 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-18 18:06:47 +0100 |
| commit | 4300876c81c03f90a6f1dfca675e74bc0bcf46a5 (patch) | |
| tree | 43429d0a4e647c452bc442ef90630574cc862d0c | |
| parent | 0dc8613864052172447d32338f4492669918cefa (diff) | |
build: secp256k1 as a subdir, since it's required
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/Makefile.test.include | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 517bded369..556fd49c0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ +DIST_SUBDIRS = secp256k1 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) @@ -32,7 +33,7 @@ LIBBITCOINQT=qt/libbitcoinqt.a LIBSECP256K1=secp256k1/libsecp256k1.la $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) - @$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) # Make is not made aware of per-object dependencies to avoid limiting building parallelization # But to build the less dependent modules first, we manually select their order here: @@ -334,11 +335,11 @@ CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno DISTCLEANFILES = obj/build.h -EXTRA_DIST = leveldb secp256k1 +EXTRA_DIST = leveldb clean-local: -$(MAKE) -C leveldb clean - -$(MAKE) -C secp256k1 clean 2>/dev/null + -$(MAKE) -C secp256k1 clean rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno -rm -f config.h diff --git a/src/Makefile.test.include b/src/Makefile.test.include index da5c746cc2..79509c9a3e 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -104,6 +104,9 @@ bitcoin_test_check: $(TEST_BINARY) FORCE bitcoin_test_clean : FORCE rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) +check-local: + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check + %.json.h: %.json @$(MKDIR_P) $(@D) @echo "namespace json_tests{" > $@ |