Skip to content

Commit 248b3fa

Browse files
committed
Makefile: call cargo for binary targets if workspace library dependencies changed
Changelog-None
1 parent 62c1b70 commit 248b3fa

2 files changed

Lines changed: 14 additions & 17 deletions

File tree

‎cln-rpc/Makefile‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,4 @@ MSGGEN_GENALL += $(CLN_RPC_GENALL)
1111
target/${RUST_PROFILE}/examples/cln-rpc-getinfo: ${CLN_RPC_SOURCES} cln-rpc/examples/getinfo.rs
1212
$(CARGO) build ${CARGO_OPTS} --example cln-rpc-getinfo
1313

14-
target/${RUST_PROFILE}/examples/cln-plugin-startup: ${CLN_RPC_SOURCES} plugins/examples/cln-plugin-startup.rs
15-
$(CARGO) build ${CARGO_OPTS} --example cln-plugin-startup
16-
17-
target/${RUST_PROFILE}/examples/cln-plugin-reentrant: ${CLN_RPC_SOURCES} plugins/examples/cln-plugin-reentrant.rs
18-
$(CARGO) build ${CARGO_OPTS} --example cln-plugin-reentrant
19-
20-
2114
cln-rpc-all: ${CLN_RPC_GENALL} ${CLN_RPC_EXAMPLES}

‎plugins/Makefile‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@ PLUGIN_BASES := $(PLUGINS:plugins/%=%) $(PY_PLUGINS:plugins/%=%)
258258
plugins/list_of_builtin_plugins_gen.h: plugins/Makefile Makefile config.vars
259259
@$(call VERBOSE,GEN $@,echo "static const char *list_of_builtin_plugins[] = { $(PLUGIN_BASES:%=\"%\",) NULL };" > $@)
260260

261-
$(RUST_TARGET_DIR)/examples/cln-subscribe-wildcard: ${CLN_PLUGIN_SRC} plugins/examples/cln-subscribe-wildcard.rs
262-
$(CARGO) build ${CARGO_OPTS} --example cln-subscribe-wildcard
263-
264261
CLN_PLUGIN_EXAMPLES := \
265262
$(RUST_TARGET_DIR)/examples/cln-plugin-startup \
266263
$(RUST_TARGET_DIR)/examples/cln-plugin-reentrant \
@@ -275,19 +272,26 @@ CLN_WSS_PROXY_PLUGIN_SRC = $(shell find plugins/wss-proxy-plugin/src -name "*.rs
275272
CLN_BIP353_PLUGIN_SRC = $(shell find plugins/bip353-plugin/src -name "*.rs")
276273
CLN_CURRENCYRATE_PLUGIN_SRC = $(shell find plugins/currencyrate-plugin/src -name "*.rs")
277274

278-
$(RUST_TARGET_DIR)/cln-grpc: ${CLN_PLUGIN_SRC} ${CLN_GRPC_PLUGIN_SRC} $(MSGGEN_GENALL) $(MSGGEN_GEN_ALL)
275+
$(RUST_TARGET_DIR)/examples/cln-plugin-startup: ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} plugins/examples/cln-plugin-startup.rs
276+
$(CARGO) build ${CARGO_OPTS} --example cln-plugin-startup
277+
$(RUST_TARGET_DIR)/examples/cln-plugin-reentrant: ${CLN_PLUGIN_SRC} plugins/examples/cln-plugin-reentrant.rs
278+
$(CARGO) build ${CARGO_OPTS} --example cln-plugin-reentrant
279+
$(RUST_TARGET_DIR)/examples/cln-subscribe-wildcard: ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} plugins/examples/cln-subscribe-wildcard.rs
280+
$(CARGO) build ${CARGO_OPTS} --example cln-subscribe-wildcard
281+
282+
$(RUST_TARGET_DIR)/cln-grpc: ${CLN_PLUGIN_SRC} ${CLN_GRPC_PLUGIN_SRC} ${CLN_RPC_SOURCES} $(MSGGEN_GENALL) $(MSGGEN_GEN_ALL)
279283
$(CARGO) build ${CARGO_OPTS} --bin cln-grpc
280-
$(RUST_TARGET_DIR)/clnrest: ${CLN_REST_PLUGIN_SRC}
284+
$(RUST_TARGET_DIR)/clnrest: ${CLN_REST_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC}
281285
$(CARGO) build ${CARGO_OPTS} --bin clnrest
282-
$(RUST_TARGET_DIR)/cln-lsps-client: ${CLN_LSPS_PLUGIN_SRC}
286+
$(RUST_TARGET_DIR)/cln-lsps-client: ${CLN_LSPS_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC}
283287
$(CARGO) build ${CARGO_OPTS} --bin cln-lsps-client
284-
$(RUST_TARGET_DIR)/cln-lsps-service: ${CLN_LSPS_PLUGIN_SRC}
288+
$(RUST_TARGET_DIR)/cln-lsps-service: ${CLN_LSPS_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC}
285289
$(CARGO) build ${CARGO_OPTS} --bin cln-lsps-service
286-
$(RUST_TARGET_DIR)/wss-proxy: ${CLN_WSS_PROXY_PLUGIN_SRC}
290+
$(RUST_TARGET_DIR)/wss-proxy: ${CLN_WSS_PROXY_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC}
287291
$(CARGO) build ${CARGO_OPTS} --bin wss-proxy
288-
$(RUST_TARGET_DIR)/cln-bip353: ${CLN_BIP353_PLUGIN_SRC}
292+
$(RUST_TARGET_DIR)/cln-bip353: ${CLN_BIP353_PLUGIN_SRC} ${CLN_PLUGIN_SRC}
289293
$(CARGO) build ${CARGO_OPTS} --bin cln-bip353
290-
$(RUST_TARGET_DIR)/cln-currencyrate: ${CLN_CURRENCYRATE_PLUGIN_SRC}
294+
$(RUST_TARGET_DIR)/cln-currencyrate: ${CLN_CURRENCYRATE_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC}
291295
$(CARGO) build ${CARGO_OPTS} --bin cln-currencyrate
292296

293297
ifneq ($(RUST),0)

0 commit comments

Comments
 (0)