From 7c2ecd8241eb0539e4f900a479cd4a04ec516312 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 3 Mar 2021 11:42:55 +1030 Subject: [PATCH] wire/Makefile: make sure we regen exp files if patches change. Signed-off-by: Rusty Russell --- wire/Makefile | 6 +++--- wire/common_wiregen.c | 2 +- wire/common_wiregen.h | 2 +- wire/onion_wiregen.c | 2 +- wire/onion_wiregen.h | 2 +- wire/peer_wiregen.c | 2 +- wire/peer_wiregen.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wire/Makefile b/wire/Makefile index a38988de8..c0e10636d 100644 --- a/wire/Makefile +++ b/wire/Makefile @@ -79,13 +79,13 @@ wire/bolt12_wire.csv.raw: bolt-precheck @$(BOLT_EXTRACT) $(LOCAL_BOLTDIR)/12*.md > $@ # How to make the exp versions from non-exp versions: -wire/peer_exp_wire.csv: wire/peer_wire.csv +wire/peer_exp_wire.csv: wire/peer_wire.csv $(PEER_EXP_PATCHES) @set -e; T=$@; trap "rm -f $$T.$$$$" 0; cp $< $$T.$$$$; for p in $(PEER_EXP_PATCHES); do echo APPLY $$p; patch $$T.$$$$ $$p; done; mv $$T.$$$$ $$T -wire/onion_exp_wire.csv: wire/onion_wire.csv +wire/onion_exp_wire.csv: wire/onion_wire.csv $(ONION_EXP_PATCHES) @set -e; T=$@; trap "rm -f $$T.$$$$" 0; cp $< $$T.$$$$; for p in $(ONION_EXP_PATCHES); do echo APPLY $$p; patch $$T.$$$$ $$p; done; mv $$T.$$$$ $$T -wire/bolt12_exp_wire.csv: wire/bolt12_wire.csv +wire/bolt12_exp_wire.csv: wire/bolt12_wire.csv $(BOLT12_EXP_PATCHES) @set -e; T=$@; trap "rm -f $$T.$$$$" 0; cp $< $$T.$$$$; for p in $(BOLT12_EXP_PATCHES); do echo APPLY $$p; patch $$T.$$$$ $$p; done; mv $$T.$$$$ $$T # These can be deleted. diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c index 25f7fc46a..315567384 100644 --- a/wire/common_wiregen.c +++ b/wire/common_wiregen.c @@ -100,4 +100,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg) fromwire_u8_array(&cursor, &plen, *msg, msg_len); return cursor != NULL; } -// SHA256STAMP:304c3015d0df2a9436adf3c2c96365d438781a5cf55b9ccba73a05dd7bc28a4d +// SHA256STAMP:65c5b5accba767d72ee72ac8915a4fcf0524ef688d3bdfaa1e4a548ba041b354 diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h index faa8de609..9ec1fe6de 100644 --- a/wire/common_wiregen.h +++ b/wire/common_wiregen.h @@ -41,4 +41,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg); #endif /* LIGHTNING_WIRE_COMMON_WIREGEN_H */ -// SHA256STAMP:304c3015d0df2a9436adf3c2c96365d438781a5cf55b9ccba73a05dd7bc28a4d +// SHA256STAMP:65c5b5accba767d72ee72ac8915a4fcf0524ef688d3bdfaa1e4a548ba041b354 diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c index fdf848c4f..adef035c9 100644 --- a/wire/onion_wiregen.c +++ b/wire/onion_wiregen.c @@ -1026,4 +1026,4 @@ bool fromwire_mpp_timeout(const void *p) return false; return cursor != NULL; } -// SHA256STAMP:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f +// SHA256STAMP:720f5585d10f973a398e821541c6a2f0841c338c0c73f53bd4215d7bcad378d1 diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h index 71e78b33c..01f011da4 100644 --- a/wire/onion_wiregen.h +++ b/wire/onion_wiregen.h @@ -317,4 +317,4 @@ bool fromwire_mpp_timeout(const void *p); #endif /* LIGHTNING_WIRE_ONION_WIREGEN_H */ -// SHA256STAMP:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f +// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98 diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c index 464e74629..7256b2e26 100644 --- a/wire/peer_wiregen.c +++ b/wire/peer_wiregen.c @@ -1749,4 +1749,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec *htlc_maximum_msat = fromwire_amount_msat(&cursor, &plen); return cursor != NULL; } -// SHA256STAMP:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60 +// SHA256STAMP:d664c34d8dddb0c11be08e907fb3f58deda009cee08661afa7030101c2a7c5f3 diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h index 3d08bd645..77b724271 100644 --- a/wire/peer_wiregen.h +++ b/wire/peer_wiregen.h @@ -650,4 +650,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec #endif /* LIGHTNING_WIRE_PEER_WIREGEN_H */ -// SHA256STAMP:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60 +// SHA256STAMP:d664c34d8dddb0c11be08e907fb3f58deda009cee08661afa7030101c2a7c5f3