bkpr: add bookkeeper to PLUGINS list

This makes it start up automatically
ElementsProject · Jul 11, 2022 · 0c3d53f · 0c3d53f
1 parent 47b4dd7
commit 0c3d53f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -100,11 +100,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				\
@@ -158,6 +153,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
@@ -32,9 +32,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: common/bolt12.o common/bolt12_merkle.o $(BOOKKEEPER_OBJS) $(PLUGIN_LIB_OBJS) $(JSMN_OBJTS) $(CCAN_OBJS) $(PLUGIN_COMMON_OBJS) $(WIRE_OBJS) $(DB_OBJS)