Put the 'd' back in the daemons.

@renepickhardt: why is it actually lightningd.c with a d but hsm.c without d ?

And delete unused gossipd/gossip.h.

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

channeld/Makefile

@@ -20,7 +20,7 @@ LIGHTNINGD_CHANNEL_HEADERS_NOGEN :=			\
 
 LIGHTNINGD_CHANNEL_HEADERS := $(LIGHTNINGD_CHANNEL_HEADERS_GEN) $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN)
 
-LIGHTNINGD_CHANNEL_SRC := channeld/channel.c	\
+LIGHTNINGD_CHANNEL_SRC := channeld/channeld.c	\
 	channeld/commit_tx.c			\
 	channeld/full_channel.c		\
 	channeld/gen_channel_wire.c

closingd/Makefile

@@ -16,7 +16,7 @@ LIGHTNINGD_CLOSING_HEADERS_NOGEN :=
 
 LIGHTNINGD_CLOSING_HEADERS := $(LIGHTNINGD_CLOSING_HEADERS_GEN) $(LIGHTNINGD_CLOSING_HEADERS_NOGEN)
 
-LIGHTNINGD_CLOSING_SRC := closingd/closing.c	\
+LIGHTNINGD_CLOSING_SRC := closingd/closingd.c	\
 	$(LIGHTNINGD_CLOSING_HEADERS:.h=.c)
 LIGHTNINGD_CLOSING_OBJS := $(LIGHTNINGD_CLOSING_SRC:.c=.o)
 

connectd/Makefile

@@ -14,7 +14,7 @@ LIGHTNINGD_CONNECT_CONTROL_OBJS := $(LIGHTNINGD_CONNECT_CONTROL_SRC:.c=.o)
 # connectd needs these:
 LIGHTNINGD_CONNECT_HEADERS := connectd/gen_connect_wire.h \
 	connectd/gen_connect_gossip_wire.h		\
-	connectd/connect.h				\
+	connectd/connectd.h				\
 	connectd/handshake.h				\
 	connectd/netaddress.h				\
 	connectd/tor_autoservice.h			\

connectd/connectd.c

@@ -30,7 +30,7 @@
 #include <common/version.h>
 #include <common/wire_error.h>
 #include <common/wireaddr.h>
-#include <connectd/connect.h>
+#include <connectd/connectd.h>
 #include <connectd/gen_connect_gossip_wire.h>
 #include <connectd/gen_connect_wire.h>
 #include <connectd/handshake.h>

connectd/connectd.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_CONNECTD_CONNECT_H
-#define LIGHTNING_CONNECTD_CONNECT_H
+#ifndef LIGHTNING_CONNECTD_CONNECTD_H
+#define LIGHTNING_CONNECTD_CONNECTD_H
 #include "config.h"
 
 struct io_conn;
@@ -7,4 +7,4 @@ struct reaching;
 
 struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach);
 
-#endif /* LIGHTNING_CONNECTD_CONNECT_H */
+#endif /* LIGHTNING_CONNECTD_CONNECTD_H */

connectd/tor.c

@@ -4,7 +4,7 @@
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/wireaddr.h>
-#include <connectd/connect.h>
+#include <connectd/connectd.h>
 #include <connectd/tor.h>
 #include <netdb.h>
 #include <netinet/in.h>

gossipd/Makefile

@@ -13,12 +13,11 @@ LIGHTNINGD_GOSSIP_CONTROL_OBJS := $(LIGHTNINGD_GOSSIP_CONTROL_SRC:.c=.o)
 
 # gossipd needs these:
 LIGHTNINGD_GOSSIP_HEADERS := gossipd/gen_gossip_wire.h \
-	gossipd/gossip.h				\
 	gossipd/gen_gossip_store.h			\
 	gossipd/gossip_store.h				\
 	gossipd/routing.h				\
 	gossipd/broadcast.h
-LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c)
+LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c) gossipd/gossipd.c
 LIGHTNINGD_GOSSIP_OBJS := $(LIGHTNINGD_GOSSIP_SRC:.c=.o)
 
 # Make sure these depend on everything.

gossipd/gossip.h

@@ -1,10 +0,0 @@
-#ifndef LIGHTNING_GOSSIPD_GOSSIP_H
-#define LIGHTNING_GOSSIPD_GOSSIP_H
-#include "config.h"
-
-struct io_conn;
-struct reaching;
-
-struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach);
-
-#endif /* LIGHTNING_GOSSIPD_GOSSIP_H */

gossipd/gossipd.c

@@ -35,7 +35,6 @@
 #include <fcntl.h>
 #include <gossipd/broadcast.h>
 #include <gossipd/gen_gossip_wire.h>
-#include <gossipd/gossip.h>
 #include <gossipd/routing.h>
 #include <hsmd/client.h>
 #include <hsmd/gen_hsm_client_wire.h>

hsmd/Makefile

@@ -14,7 +14,7 @@ LIGHTNINGD_HSM_CLIENT_OBJS := $(LIGHTNINGD_HSM_CLIENT_SRC:.c=.o)
 # lightningd/hsm needs these:
 LIGHTNINGD_HSM_HEADERS := hsmd/gen_hsm_client_wire.h
 
-LIGHTNINGD_HSM_SRC := hsmd/hsm.c	\
+LIGHTNINGD_HSM_SRC := hsmd/hsmd.c	\
 	$(LIGHTNINGD_HSM_HEADERS:.h=.c)
 LIGHTNINGD_HSM_OBJS := $(LIGHTNINGD_HSM_SRC:.c=.o)
 

onchaind/Makefile

@@ -22,7 +22,7 @@ LIGHTNINGD_ONCHAIN_HEADERS_NOGEN :=			\
 
 LIGHTNINGD_ONCHAIN_HEADERS := $(LIGHTNINGD_ONCHAIN_HEADERS_GEN) $(LIGHTNINGD_ONCHAIN_HEADERS_NOGEN)
 
-LIGHTNINGD_ONCHAIN_SRC := onchaind/onchain.c	\
+LIGHTNINGD_ONCHAIN_SRC := onchaind/onchaind.c	\
 	onchaind/gen_onchain_wire.c		\
 	onchaind/onchain_wire.c
 

onchaind/test/run-grind_feerate.c

@@ -7,7 +7,7 @@
 
 #define main unused_main
 int main(int argc, char *argv[]);
-#include "../onchain.c"
+#include "../onchaind.c"
 #undef main
 
 /* AUTOGENERATED MOCKS START */

openingd/Makefile

@@ -16,7 +16,7 @@ LIGHTNINGD_OPENING_HEADERS_NOGEN :=
 
 LIGHTNINGD_OPENING_HEADERS := $(LIGHTNINGD_OPENING_HEADERS_GEN) $(LIGHTNINGD_OPENING_HEADERS_NOGEN)
 
-LIGHTNINGD_OPENING_SRC := openingd/opening.c	\
+LIGHTNINGD_OPENING_SRC := openingd/openingd.c	\
 	$(LIGHTNINGD_OPENING_HEADERS:.h=.c)
 LIGHTNINGD_OPENING_OBJS := $(LIGHTNINGD_OPENING_SRC:.c=.o)