diff --git a/cln-rpc/Makefile b/cln-rpc/Makefile index 342685b6509a..4bd6b832569a 100644 --- a/cln-rpc/Makefile +++ b/cln-rpc/Makefile @@ -11,11 +11,4 @@ MSGGEN_GENALL += $(CLN_RPC_GENALL) target/${RUST_PROFILE}/examples/cln-rpc-getinfo: ${CLN_RPC_SOURCES} cln-rpc/examples/getinfo.rs $(CARGO) build ${CARGO_OPTS} --example cln-rpc-getinfo -target/${RUST_PROFILE}/examples/cln-plugin-startup: ${CLN_RPC_SOURCES} plugins/examples/cln-plugin-startup.rs - $(CARGO) build ${CARGO_OPTS} --example cln-plugin-startup - -target/${RUST_PROFILE}/examples/cln-plugin-reentrant: ${CLN_RPC_SOURCES} plugins/examples/cln-plugin-reentrant.rs - $(CARGO) build ${CARGO_OPTS} --example cln-plugin-reentrant - - cln-rpc-all: ${CLN_RPC_GENALL} ${CLN_RPC_EXAMPLES} diff --git a/plugins/Makefile b/plugins/Makefile index d302cc74d597..9179e1d116fa 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -258,9 +258,6 @@ PLUGIN_BASES := $(PLUGINS:plugins/%=%) $(PY_PLUGINS:plugins/%=%) plugins/list_of_builtin_plugins_gen.h: plugins/Makefile Makefile config.vars @$(call VERBOSE,GEN $@,echo "static const char *list_of_builtin_plugins[] = { $(PLUGIN_BASES:%=\"%\",) NULL };" > $@) -$(RUST_TARGET_DIR)/examples/cln-subscribe-wildcard: ${CLN_PLUGIN_SRC} plugins/examples/cln-subscribe-wildcard.rs - $(CARGO) build ${CARGO_OPTS} --example cln-subscribe-wildcard - CLN_PLUGIN_EXAMPLES := \ $(RUST_TARGET_DIR)/examples/cln-plugin-startup \ $(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 CLN_BIP353_PLUGIN_SRC = $(shell find plugins/bip353-plugin/src -name "*.rs") CLN_CURRENCYRATE_PLUGIN_SRC = $(shell find plugins/currencyrate-plugin/src -name "*.rs") -$(RUST_TARGET_DIR)/cln-grpc: ${CLN_PLUGIN_SRC} ${CLN_GRPC_PLUGIN_SRC} $(MSGGEN_GENALL) $(MSGGEN_GEN_ALL) +$(RUST_TARGET_DIR)/examples/cln-plugin-startup: ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} plugins/examples/cln-plugin-startup.rs + $(CARGO) build ${CARGO_OPTS} --example cln-plugin-startup +$(RUST_TARGET_DIR)/examples/cln-plugin-reentrant: ${CLN_PLUGIN_SRC} plugins/examples/cln-plugin-reentrant.rs + $(CARGO) build ${CARGO_OPTS} --example cln-plugin-reentrant +$(RUST_TARGET_DIR)/examples/cln-subscribe-wildcard: ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} plugins/examples/cln-subscribe-wildcard.rs + $(CARGO) build ${CARGO_OPTS} --example cln-subscribe-wildcard + +$(RUST_TARGET_DIR)/cln-grpc: ${CLN_PLUGIN_SRC} ${CLN_GRPC_PLUGIN_SRC} ${CLN_RPC_SOURCES} $(MSGGEN_GENALL) $(MSGGEN_GEN_ALL) $(CARGO) build ${CARGO_OPTS} --bin cln-grpc -$(RUST_TARGET_DIR)/clnrest: ${CLN_REST_PLUGIN_SRC} +$(RUST_TARGET_DIR)/clnrest: ${CLN_REST_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} $(CARGO) build ${CARGO_OPTS} --bin clnrest -$(RUST_TARGET_DIR)/cln-lsps-client: ${CLN_LSPS_PLUGIN_SRC} +$(RUST_TARGET_DIR)/cln-lsps-client: ${CLN_LSPS_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} $(CARGO) build ${CARGO_OPTS} --bin cln-lsps-client -$(RUST_TARGET_DIR)/cln-lsps-service: ${CLN_LSPS_PLUGIN_SRC} +$(RUST_TARGET_DIR)/cln-lsps-service: ${CLN_LSPS_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} $(CARGO) build ${CARGO_OPTS} --bin cln-lsps-service -$(RUST_TARGET_DIR)/wss-proxy: ${CLN_WSS_PROXY_PLUGIN_SRC} +$(RUST_TARGET_DIR)/wss-proxy: ${CLN_WSS_PROXY_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} $(CARGO) build ${CARGO_OPTS} --bin wss-proxy -$(RUST_TARGET_DIR)/cln-bip353: ${CLN_BIP353_PLUGIN_SRC} +$(RUST_TARGET_DIR)/cln-bip353: ${CLN_BIP353_PLUGIN_SRC} ${CLN_PLUGIN_SRC} $(CARGO) build ${CARGO_OPTS} --bin cln-bip353 -$(RUST_TARGET_DIR)/cln-currencyrate: ${CLN_CURRENCYRATE_PLUGIN_SRC} +$(RUST_TARGET_DIR)/cln-currencyrate: ${CLN_CURRENCYRATE_PLUGIN_SRC} ${CLN_RPC_SOURCES} ${CLN_PLUGIN_SRC} $(CARGO) build ${CARGO_OPTS} --bin cln-currencyrate ifneq ($(RUST),0)