From 69fc9c28bc6f2e4f19ebb66dfdbc2e44f592496b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 15 Jun 2023 11:35:21 +0930 Subject: [PATCH] Makefile: correctly erase generated contrib/pyln-testing/pyln/testing/ in distclean, and rebuild by default. And add contrib/pyln-testing/pyln/testing/grpc2py.py since we didn't previously know how to build it! Signed-off-by: Rusty Russell --- Makefile | 5 +++-- cln-grpc/Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 03309d685..2da9e853c 100644 --- a/Makefile +++ b/Makefile @@ -274,7 +274,7 @@ ifeq ($(HAVE_POSTGRES),1) LDLIBS += $(POSTGRES_LDLIBS) endif -default: show-flags all-programs all-test-programs doc-all default-targets +default: show-flags all-programs all-test-programs doc-all default-targets $(PYTHON_GENERATED) ifneq ($(SUPPRESS_GENERATION),1) FORCE = FORCE @@ -419,7 +419,7 @@ mkdocs.yml: $(MANPAGES:=.md) # Don't delete these intermediaries. -.PRECIOUS: $(ALL_GEN_HEADERS) $(ALL_GEN_SOURCES) +.PRECIOUS: $(ALL_GEN_HEADERS) $(ALL_GEN_SOURCES) $(PYTHON_GENERATED) # Every single object file. ALL_OBJS := $(ALL_C_SOURCES:.c=.o) @@ -689,6 +689,7 @@ default-targets: $(DEFAULT_TARGETS) distclean: clean $(RM) ccan/config.h config.vars + $(RM) $(PYTHON_GENERATED) maintainer-clean: distclean @echo 'This command is intended for maintainers to use; it' diff --git a/cln-grpc/Makefile b/cln-grpc/Makefile index 9307fba12..214579c23 100644 --- a/cln-grpc/Makefile +++ b/cln-grpc/Makefile @@ -8,6 +8,6 @@ CLN_GRPC_GENALL = cln-grpc/proto/node.proto \ DEFAULT_TARGETS += $(CLN_GRPC_EXAMPLES) $(CLN_GRPC_GENALL) -MSGGEN_GENALL += $(CLN_GRPC_GENALL) +MSGGEN_GENALL += $(CLN_GRPC_GENALL) contrib/pyln-testing/pyln/testing/grpc2py.py cln-grpc-all: ${CLN_GRPC_GENALL} ${CLN_GRPC_EXAMPLES}