From 33748bf119955209e9cc69cde3d6a3d43e93edc5 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 11 Jan 2017 10:14:17 +1030 Subject: [PATCH] lightningd/Makefile: combine all headers (wire/gen was missing) Signed-off-by: Rusty Russell --- lightningd/Makefile | 15 +++++++++++++-- lightningd/gossip/Makefile | 2 +- lightningd/handshake/Makefile | 2 +- lightningd/hsm/Makefile | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lightningd/Makefile b/lightningd/Makefile index b71822ac6..c696ea5c3 100644 --- a/lightningd/Makefile +++ b/lightningd/Makefile @@ -49,9 +49,20 @@ LIGHTNINGD_HEADERS = \ lightningd/hsm_control.h \ lightningd/lightningd.h \ lightningd/peer_control.h \ - lightningd/subdaemon.h + lightningd/subdaemon.h \ + $(WIRE_HEADERS) $(WIRE_GEN_HEADERS) \ + $(LIGHTNINGD_JSMN_HEADERS) \ + $(BITCOIN_HEADERS) \ + $(CORE_HEADERS) \ + $(GEN_HEADERS) \ + $(CCAN_HEADERS) \ + $(DAEMON_HEADERS) \ + $(LIGHTNINGD_HSM_CONTROL_HEADERS) \ + $(LIGHTNINGD_HANDSHAKE_CONTROL_HEADERS) \ + $(LIBBASE58_HEADERS) \ + $(LIBSODIUM_HEADERS) -$(LIGHTNINGD_OBJS) $(LIGHTNINGD_LIB_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_JSMN_HEADERS) $(BITCOIN_HEADERS) $(CORE_HEADERS) $(GEN_HEADERS) $(CCAN_HEADERS) $(DAEMON_HEADERS) $(LIGHTNINGD_HSM_CONTROL_HEADERS) $(LIGHTNINGD_HANDSHAKE_CONTROL_HEADERS) $(LIBBASE58_HEADERS) $(LIBSODIUM_HEADERS) +$(LIGHTNINGD_OBJS) $(LIGHTNINGD_LIB_OBJS): $(LIGHTNINGD_HEADERS) include lightningd/hsm/Makefile include lightningd/handshake/Makefile diff --git a/lightningd/gossip/Makefile b/lightningd/gossip/Makefile index f4f25c8cc..f5a58cb5c 100644 --- a/lightningd/gossip/Makefile +++ b/lightningd/gossip/Makefile @@ -27,7 +27,7 @@ LIGHTNINGD_GOSSIP_ALLHEADERS_NOGEN := $(filter-out lightningd/gossip/gen_%, $(LI # Add to headers which any object might need. LIGHTNINGD_HEADERS += $(LIGHTNINGD_GOSSIP_HEADERS) -$(LIGHTNINGD_GOSSIP_OBJS) $(LIGHTNINGD_GOSSIP_CLIENT_OBJS): $(CCAN_HEADERS) $(CORE_HEADERS) $(BITCOIN_HEADERS) $(GEN_HEADERS) $(WIRE_HEADERS) $(LIGHTNINGD_GOSSIP_HEADERS) $(LIGHTNINGD_GOSSIP_GEN_HEADERS) $(LIGHTNINGD_LIB_HEADERS) $(LIBBASE58_HEADERS) $(LIGHTNINGD_HEADERS) $(LIBSODIUM_HEADERS) +$(LIGHTNINGD_GOSSIP_OBJS) $(LIGHTNINGD_GOSSIP_CLIENT_OBJS): $(LIGHTNINGD_HEADERS) lightningd/gossip-all: lightningd/lightningd_gossip $(LIGHTNINGD_GOSSIP_CLIENT_OBJS) diff --git a/lightningd/handshake/Makefile b/lightningd/handshake/Makefile index 005c6e235..d5ce204f5 100644 --- a/lightningd/handshake/Makefile +++ b/lightningd/handshake/Makefile @@ -28,7 +28,7 @@ LIGHTNINGD_HANDSHAKE_SRC_NOGEN := $(filter-out lightningd/handshake/gen_%, $(LIG # Add to headers which any object might need. LIGHTNINGD_HEADERS += $(LIGHTNINGD_HANDSHAKE_HEADERS) -$(LIGHTNINGD_HANDSHAKE_OBJS): $(CCAN_HEADERS) $(CORE_HEADERS) $(GEN_HEADERS) $(WIRE_HEADERS) $(BITCOIN_HEADERS) $(LIGHTNINGD_HANDSHAKE_HEADERS) $(LIGHTNINGD_HSM_CLIENT_HEADERS) $(LIBBASE58_HEADERS) $(LIGHTNINGD_HEADERS) $(LIBSODIUM_HEADERS) +$(LIGHTNINGD_HANDSHAKE_OBJS): $(LIGHTNINGD_HEADERS) lightningd/handshake/gen_handshake_control_wire.h: $(WIRE_GEN) lightningd/handshake/handshake_control_wire_csv $(WIRE_GEN) --header $@ handshake_control_wire_type < lightningd/handshake/handshake_control_wire_csv > $@ diff --git a/lightningd/hsm/Makefile b/lightningd/hsm/Makefile index ffaf383d1..aca47fa9d 100644 --- a/lightningd/hsm/Makefile +++ b/lightningd/hsm/Makefile @@ -33,7 +33,7 @@ LIGHTNINGD_HSM_ALLHEADERS_NOGEN := $(filter-out lightningd/hsm/gen_%, $(LIGHTNIN # Add to headers which any object might need. LIGHTNINGD_HEADERS += $(LIGHTNINGD_HSM_HEADERS) -$(LIGHTNINGD_HSM_OBJS) $(LIGHTNINGD_HSM_CLIENT_OBJS): $(CCAN_HEADERS) $(CORE_HEADERS) $(BITCOIN_HEADERS) $(GEN_HEADERS) $(WIRE_HEADERS) $(LIGHTNINGD_HSM_HEADERS) $(LIGHTNINGD_HSM_GEN_HEADERS) $(LIBBASE58_HEADERS) $(LIGHTNINGD_HEADERS) +$(LIGHTNINGD_HSM_OBJS) $(LIGHTNINGD_HSM_CLIENT_OBJS): $(LIGHTNINGD_HEADERS) lightningd/hsm-all: lightningd/lightningd_hsm $(LIGHTNINGD_HSM_CLIENT_OBJS)