From be546fc60eb7da444044a468f276a820eb9a844f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 20 Mar 2024 11:00:28 +1030 Subject: [PATCH] Makefiles: remove leftover references to $(EXP) This was also removed a while ago, it's never set. Signed-off-by: Rusty Russell --- common/test/Makefile | 2 +- connectd/Makefile | 2 +- gossipd/test/Makefile | 6 +++--- plugins/Makefile | 2 +- plugins/renepay/Makefile | 2 +- plugins/renepay/test/Makefile | 2 +- wire/test/Makefile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/test/Makefile b/common/test/Makefile index b05bb07b7..8c465bfb2 100644 --- a/common/test/Makefile +++ b/common/test/Makefile @@ -90,7 +90,7 @@ common/test/run-bolt12-format-string-test: \ common/bech32_util.o \ common/bolt12.o \ common/node_id.o \ - wire/bolt12$(EXP)_wiregen.o \ + wire/bolt12_wiregen.o \ wire/tlvstream.o \ wire/towire.o diff --git a/connectd/Makefile b/connectd/Makefile index a0b72ee8d..bbb1ab9ed 100644 --- a/connectd/Makefile +++ b/connectd/Makefile @@ -82,7 +82,7 @@ CONNECTD_COMMON_OBJS := \ common/wire_error.o \ gossipd/gossipd_wiregen.o \ gossipd/gossip_store_wiregen.o \ - wire/onion$(EXP)_wiregen.o + wire/onion_wiregen.o lightningd/lightning_connectd: $(CONNECTD_OBJS) $(CONNECTD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS) diff --git a/gossipd/test/Makefile b/gossipd/test/Makefile index 2abf4a91a..4f6c15485 100644 --- a/gossipd/test/Makefile +++ b/gossipd/test/Makefile @@ -24,8 +24,8 @@ GOSSIPD_TEST_COMMON_OBJS := \ common/utils.o \ common/wireaddr.o \ gossipd/gossip_store_wiregen.o \ - wire/peer$(EXP)_wiregen.o \ - wire/onion$(EXP)_wiregen.o \ + wire/peer_wiregen.o \ + wire/onion_wiregen.o \ wire/fromwire.o \ wire/tlvstream.o \ wire/towire.o @@ -35,7 +35,7 @@ ALL_TEST_PROGRAMS += $(GOSSIPD_TEST_PROGRAMS) # Extra stuff needed for onion tests gossipd/test/run-onion_message: \ - wire/onion$(EXP)_wiregen.o \ + wire/onion_wiregen.o \ common/blindedpath.o \ common/blinding.o \ common/hmac.o \ diff --git a/plugins/Makefile b/plugins/Makefile index 465d7e6f8..6309f0d0c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -210,7 +210,7 @@ plugins/bcli: $(PLUGIN_BCLI_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSM plugins/keysend: wire/tlvstream.o wire/onion_wiregen.o $(PLUGIN_KEYSEND_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o $(PLUGIN_KEYSEND_OBJS): $(PLUGIN_PAY_LIB_HEADER) -plugins/spenderp: bitcoin/block.o bitcoin/preimage.o bitcoin/psbt.o common/psbt_open.o common/json_channel_type.o common/channel_type.o common/features.o wire/peer${EXP}_wiregen.o $(PLUGIN_SPENDER_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) +plugins/spenderp: bitcoin/block.o bitcoin/preimage.o bitcoin/psbt.o common/psbt_open.o common/json_channel_type.o common/channel_type.o common/features.o wire/peer_wiregen.o $(PLUGIN_SPENDER_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) plugins/offers: $(PLUGIN_OFFERS_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) common/addr.o common/bolt12.o common/bolt12_merkle.o common/bolt11_json.o common/iso4217.o $(WIRE_OBJS) $(WIRE_BOLT12_OBJS) bitcoin/block.o common/channel_id.o bitcoin/preimage.o common/blindedpath.o common/invoice_path_id.o common/blinding.o common/hmac.o $(JSMN_OBJS) diff --git a/plugins/renepay/Makefile b/plugins/renepay/Makefile index 4858e8613..dbbf40c5e 100644 --- a/plugins/renepay/Makefile +++ b/plugins/renepay/Makefile @@ -11,6 +11,6 @@ ALL_C_HEADERS += $(PLUGIN_RENEPAY_HDRS) # Make all plugins depend on all plugin headers, for simplicity. $(PLUGIN_RENEPAY_OBJS): $(PLUGIN_RENEPAY_HDRS) -plugins/cln-renepay: $(PLUGIN_RENEPAY_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) bitcoin/chainparams.o common/gossmap.o common/gossmods_listpeerchannels.o common/fp16.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12$(EXP)_wiregen.o wire/onion_wiregen.o +plugins/cln-renepay: $(PLUGIN_RENEPAY_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) bitcoin/chainparams.o common/gossmap.o common/gossmods_listpeerchannels.o common/fp16.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12_wiregen.o wire/onion_wiregen.o include plugins/renepay/test/Makefile diff --git a/plugins/renepay/test/Makefile b/plugins/renepay/test/Makefile index 756ca714c..90f85de42 100644 --- a/plugins/renepay/test/Makefile +++ b/plugins/renepay/test/Makefile @@ -11,7 +11,7 @@ $(PLUGIN_RENEPAY_TEST_OBJS): $(PLUGIN_RENEPAY_SRC) PLUGIN_RENEPAY_TEST_COMMON_OBJS := \ plugins/renepay/dijkstra.o -$(PLUGIN_RENEPAY_TEST_PROGRAMS): $(PLUGIN_RENEPAY_TEST_COMMON_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) bitcoin/chainparams.o common/gossmap.o common/fp16.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12$(EXP)_wiregen.o +$(PLUGIN_RENEPAY_TEST_PROGRAMS): $(PLUGIN_RENEPAY_TEST_COMMON_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) bitcoin/chainparams.o common/gossmap.o common/fp16.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12_wiregen.o check-renepay: $(PLUGIN_RENEPAY_TEST_PROGRAMS:%=unittest/%) diff --git a/wire/test/Makefile b/wire/test/Makefile index 8ceb2c43c..997a72dae 100644 --- a/wire/test/Makefile +++ b/wire/test/Makefile @@ -24,4 +24,4 @@ $(WIRE_TEST_OBJS): $(WIRE_HEADERS) $(WIRE_SRC) $(WIRE_PRINT_SRC) wire-tests: $(WIRE_TEST_PROGRAMS:%=unittest/%) -wire/test/run-peer-wire: wire/peer$(EXP)_wiregen.o common/bigsize.o +wire/test/run-peer-wire: wire/peer_wiregen.o common/bigsize.o