Skip to content

Commit 60af755

Browse files
committed
build: univalue subdir build fixups
- Force a rebuild if the headers change - Only build the lib target - Clean univalue on 'make clean'
1 parent a1d623d commit 60af755

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ LIBUNIVALUE=univalue/libunivalue.la
3636
$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
3737
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
3838

39-
$(LIBUNIVALUE): $(wildcard univalue/lib/*)
40-
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/
39+
$(LIBUNIVALUE): $(wildcard univalue/lib/*) $(wildcard univalue/include/*)
40+
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
4141

4242
# Make is not made aware of per-object dependencies to avoid limiting building parallelization
4343
# But to build the less dependent modules first, we manually select their order here:
@@ -421,6 +421,7 @@ EXTRA_DIST = leveldb
421421
clean-local:
422422
-$(MAKE) -C leveldb clean
423423
-$(MAKE) -C secp256k1 clean
424+
-$(MAKE) -C univalue clean
424425
rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno
425426
-rm -f config.h
426427

0 commit comments

Comments
 (0)