From 71b581da4d7057281b95543dbb75d874dba0245e Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Wed, 21 Dec 2022 12:26:46 +0100 Subject: [PATCH] make: Clean up duplicate cargo examples build rules --- cln-rpc/Makefile | 6 +++++- plugins/Makefile | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cln-rpc/Makefile b/cln-rpc/Makefile index 499844612..339894ae1 100644 --- a/cln-rpc/Makefile +++ b/cln-rpc/Makefile @@ -10,7 +10,11 @@ DEFAULT_TARGETS += $(CLN_RPC_EXAMPLES) $(CLN_RPC_GENALL) $(CLN_RPC_GENALL): $(JSON_SCHEMAS) PYTHONPATH=contrib/msggen python3 contrib/msggen/msggen/__main__.py -target/debug/examples/cln-rpc-getinfo: $(shell find cln-rpc -name *.rs) +target/${RUST_PROFILE}/examples/cln-rpc-getinfo: $(shell find cln-rpc -name *.rs) cargo build ${CARGO_OPTS} --example cln-rpc-getinfo +target/${RUST_PROFILE}/examples/cln-plugin-startup: $(shell find cln-rpc -name *.rs) + cargo build ${CARGO_OPTS} --example cln-plugin-startup + + cln-rpc-all: ${CLN_RPC_GEN_ALL} ${CLN_RPC_EXAMPLES} diff --git a/plugins/Makefile b/plugins/Makefile index 87791c906..ee35f1925 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -204,11 +204,11 @@ ALL_C_HEADERS += plugins/list_of_builtin_plugins_gen.h plugins/list_of_builtin_plugins_gen.h: plugins/Makefile Makefile config.vars @$(call VERBOSE,GEN $@,echo "static const char *list_of_builtin_plugins[] = { $(foreach d,$(notdir $(PLUGINS)),\"$d\",) NULL };" > $@) -CLN_PLUGIN_EXAMPLES := target/${RUST_PROFILE}/examples/cln-plugin-startup -CLN_PLUGIN_SRC = $(shell find plugins/src -name "*.rs") +CLN_PLUGIN_EXAMPLES := \ + target/${RUST_PROFILE}/examples/cln-plugin-startup \ + target/${RUST_PROFILE}/examples/cln-rpc-getinfo -${CLN_PLUGIN_EXAMPLES}: ${CLN_PLUGIN_SRC} - (cd plugins; cargo build ${CARGO_OPTS} --examples) +CLN_PLUGIN_SRC = $(shell find plugins/src -name "*.rs") target/${RUST_PROFILE}/cln-grpc: ${CLN_PLUGIN_SRC} cargo build ${CARGO_OPTS} --bin cln-grpc