Browse Source

build: secp256k1 as a subdir, since it's required

tags/v0.15.1
Cory Fields 5 years ago
parent
commit
4300876c81
2 changed files with 7 additions and 3 deletions
  1. 4
    3
      src/Makefile.am
  2. 3
    0
      src/Makefile.test.include

+ 4
- 3
src/Makefile.am View File

@@ -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


+ 3
- 0
src/Makefile.test.include View File

@@ -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{" > $@

Loading…
Cancel
Save