From 669479b6715fade2164af01076ccb6d58f270a2e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 25 Sep 2015 11:51:18 +0930 Subject: [PATCH] gen_state_names.h: printable names for state_types enums. Signed-off-by: Rusty Russell --- Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e5a7135e2..d4020f42e 100644 --- a/Makefile +++ b/Makefile @@ -72,9 +72,11 @@ CCAN_OBJS := \ ccan-tal-str.o \ ccan-tal.o +CDUMP_OBJS := ccan-cdump.o ccan-strmap.o + PROGRAMS := $(TEST_CLI_PROGRAMS) -HEADERS := $(filter-out gen_*, $(wildcard *.h)) $(wildcard bitcoin/*.h) +HEADERS := $(filter-out gen_*, $(wildcard *.h)) $(wildcard bitcoin/*.h) gen_state_names.h CCANDIR := ccan/ CFLAGS := -g -Wall -I $(CCANDIR) -I secp256k1/include/ -DVALGRIND_HEADERS=1 $(FEATURES) @@ -87,6 +89,11 @@ TAGS: FORCE $(RM) TAGS; find . -name '*.[ch]' | xargs etags --append FORCE:: +ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o $(CDUMP_OBJS) $(CCAN_OBJS) + +gen_state_names.h: state_types.h ccan/ccan/cdump/tools/cdump-enumstr + ccan/ccan/cdump/tools/cdump-enumstr state_types.h > $@ + # We build a static libsecpk1, since we need schnorr for alpha # (and it's not API stable yet!). libsecp256k1.a: @@ -99,7 +106,7 @@ lightning.pb-c.c lightning.pb-c.h: lightning.proto $(TEST_CLI_PROGRAMS): % : %.o $(HELPER_OBJS) $(BITCOIN_OBJS) $(CCAN_OBJS) libsecp256k1.a $(PROGRAMS:=.o) $(HELPER_OBJS): $(HEADERS) -$(CCAN_OBJS) $(HELPER_OBJS) $(PROGRAM_OBJS) $(BITCOIN_OBJS): ccan/config.h +$(CCAN_OBJS) $(HELPER_OBJS) $(PROGRAM_OBJS) $(BITCOIN_OBJS) $(CDUMP_OBJS): ccan/config.h ccan/config.h: ccan/tools/configurator/configurator $< > $@ @@ -169,5 +176,9 @@ ccan-crypto-sha256.o: $(CCANDIR)/ccan/crypto/sha256/sha256.c $(CC) $(CFLAGS) -c -o $@ $< ccan-crypto-ripemd160.o: $(CCANDIR)/ccan/crypto/ripemd160/ripemd160.c $(CC) $(CFLAGS) -c -o $@ $< +ccan-cdump.o: $(CCANDIR)/ccan/cdump/cdump.c + $(CC) $(CFLAGS) -c -o $@ $< +ccan-strmap.o: $(CCANDIR)/ccan/strmap/strmap.c + $(CC) $(CFLAGS) -c -o $@ $<