From 351dc17e4602d20cd1a75323a14fa49cb87b38bb Mon Sep 17 00:00:00 2001 From: niftynei Date: Tue, 19 Jul 2022 15:26:04 +0930 Subject: [PATCH] bkpr: add bookkeeper to PLUGINS list This makes it start up automatically --- plugins/Makefile | 10 +++++----- plugins/bkpr/Makefile | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 8259eb64c..e38312c14 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -108,11 +108,6 @@ plugins/cln-grpc: target/${RUST_PROFILE}/cln-grpc PLUGINS += plugins/cln-grpc endif -# Make sure these depend on everything. -ALL_C_SOURCES += $(PLUGIN_ALL_SRC) -ALL_C_HEADERS += $(PLUGIN_ALL_HEADER) -ALL_PROGRAMS += $(C_PLUGINS) - PLUGIN_COMMON_OBJS := \ bitcoin/base58.o \ bitcoin/block.o \ @@ -165,6 +160,11 @@ PLUGIN_COMMON_OBJS := \ include plugins/bkpr/Makefile +# Make sure these depend on everything. +ALL_C_SOURCES += $(PLUGIN_ALL_SRC) +ALL_C_HEADERS += $(PLUGIN_ALL_HEADER) +ALL_PROGRAMS += $(C_PLUGINS) + # Make all plugins depend on all plugin headers, for simplicity. $(PLUGIN_ALL_OBJS): $(PLUGIN_ALL_HEADER) diff --git a/plugins/bkpr/Makefile b/plugins/bkpr/Makefile index e07686315..a205c46fc 100644 --- a/plugins/bkpr/Makefile +++ b/plugins/bkpr/Makefile @@ -23,9 +23,10 @@ BOOKKEEPER_OBJS := $(BOOKKEEPER_SRC:.c=.o) $(BOOKKEEPER_OBJS): $(PLUGIN_LIB_HEADER) $(BOOKKEEPER_HEADER) -ALL_C_SOURCES += $(BOOKKEEPER_SRC) -ALL_C_HEADERS += $(BOOKKEEPER_HEADER) -ALL_PROGRAMS += plugins/bookkeeper +PLUGIN_ALL_SRC += $(BOOKKEEPER_SRC) $(BOOKKEEPER_DB_QUERIES) +PLUGIN_ALL_HEADER += $(BOOKKEEPER_HEADER) +C_PLUGINS += plugins/bookkeeper +PLUGINS += plugins/bookkeeper plugins/bookkeeper: bitcoin/chainparams.o common/coin_mvt.o $(BOOKKEEPER_OBJS) $(PLUGIN_LIB_OBJS) $(JSMN_OBJTS) $(PLUGIN_COMMON_OBJS) $(WIRE_OBJS) $(DB_OBJS)