Skip to content

Commit

Permalink
Makefile: correctly erase generated contrib/pyln-testing/pyln/testing…
Browse files Browse the repository at this point in the history
…/ 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 <[email protected]>
  • Loading branch information
rustyrussell committed Jun 23, 2023
1 parent 8d737cc commit 69fc9c2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion cln-grpc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

0 comments on commit 69fc9c2

Please sign in to comment.