Makefile: remove EXPERIMENTAL_FEATURES marker from generated files

We're going to make experimental versions of these completely separate files.

Also remove the dependency on the Makefile itself: it simply causes
unnecessary churn.  We can always force-rebuild when we change a rule.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Makefile

@@ -201,8 +201,8 @@ CDUMP_OBJS := ccan-cdump.o ccan-strmap.o
 BOLT_GEN := tools/generate-wire.py
 WIRE_GEN := $(BOLT_GEN)
 
-# If you use wiregen, you're dependent on the tool, its templates, and Makefile
+# If you use wiregen, you're dependent on the tool and its templates
-WIRE_GEN_DEPS := $(WIRE_GEN) Makefile $(wildcard tools/gen/*_template)
+WIRE_GEN_DEPS := $(WIRE_GEN) $(wildcard tools/gen/*_template)
 
 # These are filled by individual Makefiles
 ALL_PROGRAMS :=
@@ -255,23 +255,23 @@ config.vars:
 
 # Git doesn't maintain timestamps, so we only regen if sources actually changed:
 # We place the SHA inside some generated files so we can tell if they need updating.
-# Usage: $(call SHA256STAMP_CHANGED,prefix)
+# Usage: $(call SHA256STAMP_CHANGED)
-SHA256STAMP_CHANGED = [ x"`sed -n 's/.*SHA256STAMP://p' $@ 2>/dev/null`" != x"$(1)`cat $(filter-out FORCE,$^) | sha256sum | cut -c1-64`" ]
+SHA256STAMP_CHANGED = [ x"`sed -n 's/.*SHA256STAMP://p' $@ 2>/dev/null`" != x"`cat $(filter-out FORCE,$^) | sha256sum | cut -c1-64`" ]
-# Usage: $(call SHA256STAMP,prefix,commentprefix)
+# Usage: $(call SHA256STAMP,commentprefix)
-SHA256STAMP = echo '$(2) SHA256STAMP:$(1)'`cat $(filter-out FORCE,$^) | sha256sum | cut -c1-64` >> $@
+SHA256STAMP = echo '$(1) SHA256STAMP:'`cat $(filter-out FORCE,$^) | sha256sum | cut -c1-64` >> $@
 
 # generate-wire.py --page [header|impl] hdrfilename wirename < csv > file
 %_wiregen.h: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED,exp-$(EXPERIMENTAL_FEATURES)-); then $(call VERBOSE,"wiregen $@",tools/generate-wire.py --page header $($@_args) $@ `basename $< .csv` < $< > $@ && $(call SHA256STAMP,exp-$(EXPERIMENTAL_FEATURES)-,//)); fi
+	@if $(call SHA256STAMP_CHANGED); then $(call VERBOSE,"wiregen $@",tools/generate-wire.py --page header $($@_args) $@ `basename $< .csv` < $< > $@ && $(call SHA256STAMP,//)); fi
 
 %_wiregen.c: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED,exp-$(EXPERIMENTAL_FEATURES)-); then $(call VERBOSE,"wiregen $@",tools/generate-wire.py --page impl $($@_args) ${@:.c=.h} `basename $< .csv` < $< > $@ && $(call SHA256STAMP,exp-$(EXPERIMENTAL_FEATURES)-,//)); fi
+	@if $(call SHA256STAMP_CHANGED); then $(call VERBOSE,"wiregen $@",tools/generate-wire.py --page impl $($@_args) ${@:.c=.h} `basename $< .csv` < $< > $@ && $(call SHA256STAMP,//)); fi
 
 %_printgen.h: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED,exp-$(EXPERIMENTAL_FEATURES)-); then $(call VERBOSE,"printgen $@",tools/generate-wire.py -s -P --page header $($@_args) $@ `basename $< .csv` < $< > $@ && $(call SHA256STAMP,exp-$(EXPERIMENTAL_FEATURES)-,//)); fi
+	@if $(call SHA256STAMP_CHANGED); then $(call VERBOSE,"printgen $@",tools/generate-wire.py -s -P --page header $($@_args) $@ `basename $< .csv` < $< > $@ && $(call SHA256STAMP,//)); fi
 
 %_printgen.c: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED,exp-$(EXPERIMENTAL_FEATURES)-); then $(call VERBOSE,"printgen $@",tools/generate-wire.py -s -P --page impl $($@_args) ${@:.c=.h} `basename $< .csv` < $< > $@ && $(call SHA256STAMP,exp-$(EXPERIMENTAL_FEATURES)-,//)); fi
+	@if $(call SHA256STAMP_CHANGED); then $(call VERBOSE,"printgen $@",tools/generate-wire.py -s -P --page impl $($@_args) ${@:.c=.h} `basename $< .csv` < $< > $@ && $(call SHA256STAMP,//)); fi
 
 include external/Makefile
 include bitcoin/Makefile
@@ -478,9 +478,6 @@ $(CCAN_OBJS) $(CDUMP_OBJS): $(CCAN_HEADERS) Makefile
 # Except for CCAN, we treat everything else as dependent on external/ bitcoin/ common/ wire/ and all generated headers, and Makefile
 $(ALL_OBJS): $(BITCOIN_HEADERS) $(COMMON_HEADERS) $(CCAN_HEADERS) $(WIRE_HEADERS) $(ALL_GEN_HEADERS) $(EXTERNAL_HEADERS) Makefile
 
-# Regen headers when Makefile changes
-$(ALL_GEN_HEADERS): Makefile
-
 update-ccan:
 	mv ccan ccan.old
 	DIR=$$(pwd)/ccan; cd ../ccan && ./tools/create-ccan-tree -a $$DIR `cd $$DIR.old/ccan && find * -name _info | sed s,/_info,, | $(SORT)` $(CCAN_NEW)

channeld/channeld_wiregen.c

@@ -1185,4 +1185,4 @@ bool fromwire_send_onionmsg(const tal_t *ctx, const void *p, u8 onion[1366], str
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-3a681f3ef41ab044c618653409c793a163a7c777181af6c798aff7bc9bef1a77
+// SHA256STAMP:b336984ad884507c4624dec512a7ac93b4bfe92d543a1e077a1d2cf7d3c30fd3

channeld/channeld_wiregen.h

@@ -230,4 +230,4 @@ bool fromwire_send_onionmsg(const tal_t *ctx, const void *p, u8 onion[1366], str
 
 #endif /* LIGHTNING_CHANNELD_CHANNELD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-3a681f3ef41ab044c618653409c793a163a7c777181af6c798aff7bc9bef1a77
+// SHA256STAMP:b336984ad884507c4624dec512a7ac93b4bfe92d543a1e077a1d2cf7d3c30fd3

closingd/closingd_wiregen.c

@@ -200,4 +200,4 @@ bool fromwire_closingd_complete(const void *p)
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-3235ada6c1c749bfb3885b20dae4c3a7deaa1b2716e34f30405a66cbe32d1055
+// SHA256STAMP:dbd3c58cd169d183d94e9b40e53243eb300e32d514f7891f332a117ff50f569c

closingd/closingd_wiregen.h

@@ -56,4 +56,4 @@ bool fromwire_closingd_complete(const void *p);
 
 #endif /* LIGHTNING_CLOSINGD_CLOSINGD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-3235ada6c1c749bfb3885b20dae4c3a7deaa1b2716e34f30405a66cbe32d1055
+// SHA256STAMP:dbd3c58cd169d183d94e9b40e53243eb300e32d514f7891f332a117ff50f569c

common/peer_status_wiregen.c

@@ -81,4 +81,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-e8a08a58cf4a3f67b0ad5f4cd690f4a6acb146644cd188ee5b9368451f45db70
+// SHA256STAMP:e956fdfdddc89d050229153e3db7a9539795b35b23d4c132f0f65eb0cc339d97

common/peer_status_wiregen.h

@@ -35,4 +35,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_
 
 #endif /* LIGHTNING_COMMON_PEER_STATUS_WIREGEN_H */
 
-// SHA256STAMP:exp-0-e8a08a58cf4a3f67b0ad5f4cd690f4a6acb146644cd188ee5b9368451f45db70
+// SHA256STAMP:e956fdfdddc89d050229153e3db7a9539795b35b23d4c132f0f65eb0cc339d97

common/status_wiregen.c

@@ -192,4 +192,4 @@ bool fromwire_status_peer_billboard(const tal_t *ctx, const void *p, bool *perm,
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-7e7940a7f554e158b67dd56f142a1f8a6b9b22a968b5e8fe4e3e40e2dac1fced
+// SHA256STAMP:8459550d3539dee0f13d3c40aa017972987cd7901131fdaa1be05d393424636c

common/status_wiregen.h

@@ -54,4 +54,4 @@ bool fromwire_status_peer_billboard(const tal_t *ctx, const void *p, bool *perm,
 
 #endif /* LIGHTNING_COMMON_STATUS_WIREGEN_H */
 
-// SHA256STAMP:exp-0-7e7940a7f554e158b67dd56f142a1f8a6b9b22a968b5e8fe4e3e40e2dac1fced
+// SHA256STAMP:8459550d3539dee0f13d3c40aa017972987cd7901131fdaa1be05d393424636c

connectd/connectd_gossipd_wiregen.c

@@ -162,4 +162,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-0da6e7838e67282265234c4f0a3576d32f3b10cda877991bf886a0bb2193cae7
+// SHA256STAMP:ff16f166eb5fe1a4389c503645deeea4b3e782cc3fb3fda7c87fab32c7f2ee05

connectd/connectd_gossipd_wiregen.h

@@ -55,4 +55,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi
 
 #endif /* LIGHTNING_CONNECTD_CONNECTD_GOSSIPD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-0da6e7838e67282265234c4f0a3576d32f3b10cda877991bf886a0bb2193cae7
+// SHA256STAMP:ff16f166eb5fe1a4389c503645deeea4b3e782cc3fb3fda7c87fab32c7f2ee05

connectd/connectd_wiregen.c

@@ -405,4 +405,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak)
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-11e429feabbd0b87fd8c1bdb718b4edf20121eb67ef4ce2a3d8d24a37c258b53
+// SHA256STAMP:63529c4b1d95e8cb69c017829e3269e72c0d884545ae67b925f424b231c9633a

connectd/connectd_wiregen.h

@@ -104,4 +104,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak);
 
 #endif /* LIGHTNING_CONNECTD_CONNECTD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-11e429feabbd0b87fd8c1bdb718b4edf20121eb67ef4ce2a3d8d24a37c258b53
+// SHA256STAMP:63529c4b1d95e8cb69c017829e3269e72c0d884545ae67b925f424b231c9633a

gossipd/gossip_store_wiregen.c

@@ -118,4 +118,4 @@ bool fromwire_gossip_store_delete_chan(const void *p, struct short_channel_id *s
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-e1b5e7cbfeabe064806c71200457814fbc6f987d6b49c7ba8f9d65df67dec958
+// SHA256STAMP:96e087792923799ac0e76d097bbf30972d627228742d69d9b1f90100cae8241a

gossipd/gossip_store_wiregen.h

@@ -44,4 +44,4 @@ bool fromwire_gossip_store_delete_chan(const void *p, struct short_channel_id *s
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIP_STORE_WIREGEN_H */
 
-// SHA256STAMP:exp-0-e1b5e7cbfeabe064806c71200457814fbc6f987d6b49c7ba8f9d65df67dec958
+// SHA256STAMP:96e087792923799ac0e76d097bbf30972d627228742d69d9b1f90100cae8241a

gossipd/gossipd_peerd_wiregen.c

@@ -227,4 +227,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-845eed7399afcb6681d6955638d216711dc10a151c37bfaea4de2d56b80be19d
+// SHA256STAMP:8d8786f111a7dea8a44e064e382adf00265494b06cdf4cef1c6466bd03878b73

gossipd/gossipd_peerd_wiregen.h

@@ -77,4 +77,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_PEERD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-845eed7399afcb6681d6955638d216711dc10a151c37bfaea4de2d56b80be19d
+// SHA256STAMP:8d8786f111a7dea8a44e064e382adf00265494b06cdf4cef1c6466bd03878b73

gossipd/gossipd_wiregen.c

@@ -858,4 +858,4 @@ bool fromwire_gossipd_new_blockheight(const void *p, u32 *blockheight)
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-4b29c599d2dfda038cce6193ef5b3b8e0e1000479608ff34743c77a0044f9cb4
+// SHA256STAMP:4aa62af856e3554603b0038eb0c9c6f5623cdb8d17abb6650338d1b728babd4b

gossipd/gossipd_wiregen.h

@@ -200,4 +200,4 @@ bool fromwire_gossipd_new_blockheight(const void *p, u32 *blockheight);
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-4b29c599d2dfda038cce6193ef5b3b8e0e1000479608ff34743c77a0044f9cb4
+// SHA256STAMP:4aa62af856e3554603b0038eb0c9c6f5623cdb8d17abb6650338d1b728babd4b

hsmd/hsmd_wiregen.c

@@ -1215,4 +1215,4 @@ bool fromwire_hsmd_get_output_scriptpubkey_reply(const tal_t *ctx, const void *p
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-1fa355187cf25469af30fbb94920a8d0111620ec278b0dceaf2034a26b64f27b
+// SHA256STAMP:a5ae76a1418b72d95fbb559fe568596318040de4e3726f2317969b9d9eee7788

hsmd/hsmd_wiregen.h

@@ -272,4 +272,4 @@ bool fromwire_hsmd_get_output_scriptpubkey_reply(const tal_t *ctx, const void *p
 
 #endif /* LIGHTNING_HSMD_HSMD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-1fa355187cf25469af30fbb94920a8d0111620ec278b0dceaf2034a26b64f27b
+// SHA256STAMP:a5ae76a1418b72d95fbb559fe568596318040de4e3726f2317969b9d9eee7788

onchaind/onchaind_wiregen.c

@@ -627,4 +627,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-a644f947dc012a0ea3c367ab99672f5b5a6233c8bf6fe4e3c607d57144d14063
+// SHA256STAMP:468582953e92150527baf350c80cdec02bed0a7a677fb87af0dcb4057236e00a

onchaind/onchaind_wiregen.h

@@ -156,4 +156,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt
 
 #endif /* LIGHTNING_ONCHAIND_ONCHAIND_WIREGEN_H */
 
-// SHA256STAMP:exp-0-a644f947dc012a0ea3c367ab99672f5b5a6233c8bf6fe4e3c607d57144d14063
+// SHA256STAMP:468582953e92150527baf350c80cdec02bed0a7a677fb87af0dcb4057236e00a

openingd/openingd_wiregen.c

@@ -580,4 +580,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak)
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-64ba9197a5a5fa3448590f0be252120d66e672626780227c48977ffad40a63a0
+// SHA256STAMP:164910f4bbe7967d43674158574280364e83db53c4487f5f470ac0d2a929f90b

openingd/openingd_wiregen.h

@@ -122,4 +122,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak);
 
 #endif /* LIGHTNING_OPENINGD_OPENINGD_WIREGEN_H */
 
-// SHA256STAMP:exp-0-64ba9197a5a5fa3448590f0be252120d66e672626780227c48977ffad40a63a0
+// SHA256STAMP:164910f4bbe7967d43674158574280364e83db53c4487f5f470ac0d2a929f90b

wire/common_wiregen.c

@@ -101,4 +101,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg)
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-239713127e6eda1db477804a5c4805e678384a9a4745c12cfa4bbd4212922b77
+// SHA256STAMP:b7c32f920bcd5725670e679935629442e3866d3cba8e149d3269fec6835c1908

wire/common_wiregen.h

@@ -42,4 +42,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg);
 
 #endif /* LIGHTNING_WIRE_COMMON_WIREGEN_H */
 
-// SHA256STAMP:exp-0-239713127e6eda1db477804a5c4805e678384a9a4745c12cfa4bbd4212922b77
+// SHA256STAMP:b7c32f920bcd5725670e679935629442e3866d3cba8e149d3269fec6835c1908

wire/onion_printgen.c

@@ -654,4 +654,4 @@ void printonion_wire_tlv_message(const char *tlv_name, const u8 *msg) {
 	}
 }
 
-// SHA256STAMP:exp-0-ac5e129d4da055fa6973b64be133f59ec5b57e5b82216caa5cee2c182d732fa4
+// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e

wire/onion_printgen.h

@@ -58,4 +58,4 @@ void printwire_mpp_timeout(const char *fieldname, const u8 *cursor);
 
 #endif /* LIGHTNING_WIRE_ONION_PRINTGEN_H */
 
-// SHA256STAMP:exp-0-ac5e129d4da055fa6973b64be133f59ec5b57e5b82216caa5cee2c182d732fa4
+// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e

wire/onion_wiregen.c

@@ -838,4 +838,4 @@ bool fromwire_mpp_timeout(const void *p)
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-ac5e129d4da055fa6973b64be133f59ec5b57e5b82216caa5cee2c182d732fa4
+// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e

wire/onion_wiregen.h

@@ -208,4 +208,4 @@ bool fromwire_mpp_timeout(const void *p);
 
 #endif /* LIGHTNING_WIRE_ONION_WIREGEN_H */
 
-// SHA256STAMP:exp-0-ac5e129d4da055fa6973b64be133f59ec5b57e5b82216caa5cee2c182d732fa4
+// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e

wire/peer_printgen.c

@@ -2037,4 +2037,4 @@ void printpeer_wire_tlv_message(const char *tlv_name, const u8 *msg) {
 	}
 }
 
-// SHA256STAMP:exp-0-d5b13db56b4ff42a2866aeb87a3922ceb703b145a1a1be322f7157cac99d7b96
+// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d

wire/peer_printgen.h

@@ -71,4 +71,4 @@ void printwire_channel_update_checksums(const char *fieldname, const u8 **cursor
 void printwire_channel_update_timestamps(const char *fieldname, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_PEER_PRINTGEN_H */
 
-// SHA256STAMP:exp-0-d5b13db56b4ff42a2866aeb87a3922ceb703b145a1a1be322f7157cac99d7b96
+// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d

wire/peer_wiregen.c

@@ -2751,4 +2751,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
 	return cursor != NULL;
 }
 
-// SHA256STAMP:exp-0-d5b13db56b4ff42a2866aeb87a3922ceb703b145a1a1be322f7157cac99d7b96
+// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d

wire/peer_wiregen.h

@@ -596,4 +596,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
 
 #endif /* LIGHTNING_WIRE_PEER_WIREGEN_H */
 
-// SHA256STAMP:exp-0-d5b13db56b4ff42a2866aeb87a3922ceb703b145a1a1be322f7157cac99d7b96
+// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d