lightningd/Makefile: combine all headers (wire/gen was missing)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

lightningd/Makefile

@@ -49,9 +49,20 @@ LIGHTNINGD_HEADERS =				\
 	lightningd/hsm_control.h		\
 	lightningd/lightningd.h			\
 	lightningd/peer_control.h		\
-	lightningd/subdaemon.h
-
-$(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/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) 
 
 include lightningd/hsm/Makefile
 include lightningd/handshake/Makefile

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)
 

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 > $@

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)