From b0829fc52a54f6463aa41035027d7b9373b87c98 Mon Sep 17 00:00:00 2001 From: niftynei Date: Thu, 16 Dec 2021 13:07:33 -0600 Subject: [PATCH] lightningd/Make: cleanup lightningd+wallet headers There is no "wallet_lib_headers" variable in wallet/Makefile Likewise, there were two "lightningd_headers", a couple of unused variables and some other nonsene in lightningd/Makefile --- lightningd/Makefile | 20 +++++++++----------- lightningd/test/Makefile | 2 +- wallet/Makefile | 1 - 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lightningd/Makefile b/lightningd/Makefile index c6827849e..3a9b58bb7 100644 --- a/lightningd/Makefile +++ b/lightningd/Makefile @@ -38,25 +38,27 @@ LIGHTNINGD_SRC := \ lightningd/subd.c \ lightningd/watch.c - LIGHTNINGD_SRC_NOHDR := \ lightningd/datastore.c \ lightningd/ping.c \ lightningd/offer.c \ lightningd/signmessage.c -LIGHTNINGD_HEADERS := \ +include wallet/Makefile + +LIGHTNINGD_HDRS := \ $(LIGHTNINGD_SRC:.c=.h) \ lightningd/channel_state.h \ - lightningd/channel_state_names_gen.h + lightningd/channel_state_names_gen.h \ + $(WALLET_HDRS) LIGHTNINGD_OBJS := $(LIGHTNINGD_SRC:.c=.o) $(LIGHTNINGD_SRC_NOHDR:.c=.o) -$(LIGHTNINGD_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_CONTROL_HEADERS) +$(LIGHTNINGD_OBJS): $(LIGHTNINGD_HDRS) $(LIGHTNINGD_CONTROL_HEADERS) # Make sure these depend on everything. ALL_C_SOURCES += $(LIGHTNINGD_SRC) $(LIGHTNINGD_SRC_NOHDR) -ALL_C_HEADERS += $(LIGHTNINGD_HEADERS) +ALL_C_HEADERS += $(LIGHTNINGD_HDRS) ALL_PROGRAMS += lightningd/lightningd # Common source we use. @@ -129,12 +131,8 @@ LIGHTNINGD_COMMON_OBJS := \ common/wire_error.o \ common/wireaddr.o \ -include wallet/Makefile - -# All together in one convenient var -LIGHTNINGD_HEADERS = $(LIGHTNINGD_HEADERS_NOGEN) $(LIGHTNINGD_HEADERS_GEN) $(WALLET_HDRS) - -$(LIGHTNINGD_OBJS): $(LIGHTNINGD_HEADERS) +$(LIGHTNINGD_OBJS): $(LIGHTNINGD_HDRS) +$(WALLET_OBJS): $(LIGHTNINGD_HDRS) # Only the plugin component needs to depend on this header. lightningd/plugin.o: plugins/list_of_builtin_plugins_gen.h diff --git a/lightningd/test/Makefile b/lightningd/test/Makefile index d0c3aa677..e513a6fc2 100644 --- a/lightningd/test/Makefile +++ b/lightningd/test/Makefile @@ -29,6 +29,6 @@ LIGHTNINGD_TEST_COMMON_OBJS := \ $(LIGHTNINGD_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(LIGHTNINGD_TEST_COMMON_OBJS) -$(LIGHTNINGD_TEST_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_SRC) $(LIGHTNINGD_SRC_NOHDR) +$(LIGHTNINGD_TEST_OBJS): $(LIGHTNINGD_HDRS) $(LIGHTNINGD_SRC) $(LIGHTNINGD_SRC_NOHDR) check-units: $(LIGHTNINGD_TEST_PROGRAMS:%=unittest/%) diff --git a/wallet/Makefile b/wallet/Makefile index 007872f4c..2697febf1 100644 --- a/wallet/Makefile +++ b/wallet/Makefile @@ -18,7 +18,6 @@ WALLET_SRC := $(WALLET_LIB_SRC) $(WALLET_LIB_SRC_NOHDR) $(WALLET_DB_DRIVERS) WALLET_HDRS := $(WALLET_LIB_SRC:.c=.h) WALLET_OBJS := $(WALLET_SRC:.c=.o) -$(WALLET_OBJS): $(WALLET_HDRS) $(LIGHTNINGD_HEADERS) # Make sure these depend on everything. ALL_C_SOURCES += $(WALLET_SRC) wallet/db_sqlite3_sqlgen.c wallet/db_postgres_sqlgen.c