mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-02-20 13:54:36 +01:00
common/autodata: use instead of ccan/autodata
This means it needs to be linked ~everywhere. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
parent
b594c53771
commit
24536c5561
26 changed files with 25 additions and 6 deletions
|
@ -2,7 +2,7 @@ BITCOIN_TEST_SRC := $(wildcard bitcoin/test/run-*.c)
|
|||
BITCOIN_TEST_OBJS := $(BITCOIN_TEST_SRC:.c=.o)
|
||||
BITCOIN_TEST_PROGRAMS := $(BITCOIN_TEST_OBJS:.o=)
|
||||
|
||||
BITCOIN_TEST_COMMON_OBJS := common/utils.o common/setup.o
|
||||
BITCOIN_TEST_COMMON_OBJS := common/utils.o common/setup.o common/autodata.o
|
||||
|
||||
$(BITCOIN_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_TEST_COMMON_OBJS) bitcoin/chainparams.o
|
||||
$(BITCOIN_TEST_OBJS): $(CCAN_HEADERS) $(BITCOIN_HEADERS) $(BITCOIN_SRC)
|
||||
|
|
|
@ -30,6 +30,7 @@ LIGHTNINGD_CONTROL_OBJS += channeld/channeld_wiregen.o
|
|||
# Common source we use.
|
||||
CHANNELD_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/bigsize.o \
|
||||
common/billboard.o \
|
||||
|
|
|
@ -9,6 +9,7 @@ ALL_TEST_PROGRAMS += $(CHANNELD_TEST_PROGRAMS)
|
|||
|
||||
CHANNELD_TEST_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/channel_type.o \
|
||||
common/daemon_conn.o \
|
||||
common/features.o \
|
||||
|
|
|
@ -8,6 +8,7 @@ ALL_C_SOURCES += $(CLI_TEST_SRC)
|
|||
ALL_TEST_PROGRAMS += $(CLI_TEST_PROGRAMS)
|
||||
|
||||
CLI_TEST_COMMON_OBJS := \
|
||||
common/autodata.o \
|
||||
common/configdir.o \
|
||||
common/daemon_conn.o \
|
||||
common/htlc_state.o \
|
||||
|
|
|
@ -20,6 +20,7 @@ LIGHTNINGD_CONTROL_OBJS += closingd/closingd_wiregen.o
|
|||
# Common source we use.
|
||||
CLOSINGD_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/bigsize.o \
|
||||
common/bip32.o \
|
||||
|
|
|
@ -8,6 +8,7 @@ COMMON_TEST_OBJS := $(COMMON_TEST_SRC:.c=.o)
|
|||
COMMON_TEST_PROGRAMS := $(COMMON_TEST_OBJS:.o=)
|
||||
|
||||
COMMON_TEST_COMMON_OBJS := \
|
||||
common/autodata.o \
|
||||
common/setup.o \
|
||||
common/utils.o
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define LIGHTNING_COMMON_TYPE_TO_STRING_H
|
||||
#include "config.h"
|
||||
#include "utils.h"
|
||||
#include <ccan/autodata/autodata.h>
|
||||
#include <common/autodata.h>
|
||||
|
||||
/* This must match the type_to_string_ cases. */
|
||||
union printable_types {
|
||||
|
|
|
@ -26,6 +26,7 @@ LIGHTNINGD_CONTROL_OBJS += connectd/connectd_wiregen.o
|
|||
# Common source we use.
|
||||
CONNECTD_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/base64.o \
|
||||
common/bech32.o \
|
||||
|
|
|
@ -5,6 +5,7 @@ CONNECTD_TEST_OBJS := $(CONNECTD_TEST_SRC:.c=.o)
|
|||
CONNECTD_TEST_PROGRAMS := $(CONNECTD_TEST_OBJS:.o=)
|
||||
|
||||
CONNECTD_TEST_COMMON_OBJS := \
|
||||
common/autodata.o \
|
||||
common/features.o \
|
||||
common/pseudorand.o \
|
||||
common/setup.o \
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
# Clang would detect false positive here, due to padding. See https://github.com/ElementsProject/lightning/pull/2285
|
||||
leak:ccan/ccan/autodata/autodata.c
|
||||
leak:ccan/ccan/htable/htable.c
|
||||
|
|
|
@ -13,6 +13,7 @@ ALL_PROGRAMS += $(DEVTOOLS)
|
|||
|
||||
DEVTOOLS_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/bech32.o \
|
||||
common/bech32_util.o \
|
||||
|
|
|
@ -28,6 +28,7 @@ LIGHTNINGD_CONTROL_OBJS += gossipd/gossipd_wiregen.o
|
|||
GOSSIPD_COMMON_OBJS := \
|
||||
bitcoin/chainparams.o \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/bech32.o \
|
||||
common/bech32_util.o \
|
||||
|
|
|
@ -8,6 +8,7 @@ GOSSIPD_TEST_PROGRAMS := $(GOSSIPD_TEST_OBJS:.o=)
|
|||
|
||||
GOSSIPD_TEST_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/bigsize.o \
|
||||
common/channel_id.o \
|
||||
common/features.o \
|
||||
|
|
|
@ -20,6 +20,7 @@ ALL_PROGRAMS += lightningd/lightning_hsmd
|
|||
# Common source we use.
|
||||
HSMD_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/bigsize.o \
|
||||
common/bip32.o \
|
||||
common/bolt12_merkle.o \
|
||||
|
|
|
@ -63,6 +63,7 @@ ALL_PROGRAMS += lightningd/lightningd
|
|||
LIGHTNINGD_COMMON_OBJS := \
|
||||
common/addr.o \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/base64.o \
|
||||
common/bech32.o \
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef LIGHTNING_LIGHTNINGD_JSONRPC_H
|
||||
#define LIGHTNING_LIGHTNINGD_JSONRPC_H
|
||||
#include "config.h"
|
||||
#include <ccan/autodata/autodata.h>
|
||||
#include <ccan/list/list.h>
|
||||
#include <common/autodata.h>
|
||||
#include <common/json.h>
|
||||
#include <common/json_stream.h>
|
||||
#include <common/status_levels.h>
|
||||
|
|
|
@ -9,6 +9,7 @@ ALL_TEST_PROGRAMS += $(LIGHTNINGD_TEST_PROGRAMS)
|
|||
|
||||
LIGHTNINGD_TEST_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/bech32.o \
|
||||
common/daemon_conn.o \
|
||||
common/htlc_state.o \
|
||||
|
|
|
@ -33,6 +33,7 @@ LIGHTNINGD_CONTROL_OBJS += \
|
|||
# Common source we use.
|
||||
ONCHAIND_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/bigsize.o \
|
||||
common/bip32.o \
|
||||
common/coin_mvt.o \
|
||||
|
|
|
@ -11,6 +11,7 @@ ALL_TEST_PROGRAMS += $(ONCHAIND_TEST_PROGRAMS)
|
|||
|
||||
ONCHAIND_TEST_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/features.o \
|
||||
common/pseudorand.o \
|
||||
common/setup.o \
|
||||
|
|
|
@ -32,6 +32,7 @@ LIGHTNINGD_CONTROL_OBJS += openingd/openingd_wiregen.o openingd/dualopend_wirege
|
|||
# Common source we use.
|
||||
OPENINGD_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/bigsize.o \
|
||||
common/billboard.o \
|
||||
|
|
|
@ -107,6 +107,7 @@ PLUGIN_COMMON_OBJS := \
|
|||
bitcoin/tx.o \
|
||||
bitcoin/varint.o \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/bech32.o \
|
||||
common/bech32_util.o \
|
||||
|
|
|
@ -9,6 +9,7 @@ ALL_TEST_PROGRAMS += $(PLUGIN_TEST_PROGRAMS)
|
|||
|
||||
PLUGIN_TEST_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/pseudorand.o \
|
||||
common/setup.o \
|
||||
common/type_to_string.o \
|
||||
|
|
|
@ -17,7 +17,7 @@ tools/headerversions: $(FORCE) tools/headerversions.o $(CCAN_OBJS)
|
|||
|
||||
tools/check-bolt: tools/check-bolt.o $(CCAN_OBJS) $(TOOLS_COMMON_OBJS)
|
||||
|
||||
tools/hsmtool: tools/hsmtool.o $(CCAN_OBJS) $(TOOLS_COMMON_OBJS) $(BITCOIN_OBJS) common/amount.o common/bech32.o common/bigsize.o common/configdir.o common/derive_basepoints.o common/descriptor_checksum.o common/hsm_encryption.o common/node_id.o common/type_to_string.o common/version.o wire/fromwire.o wire/towire.o
|
||||
tools/hsmtool: tools/hsmtool.o $(CCAN_OBJS) $(TOOLS_COMMON_OBJS) $(BITCOIN_OBJS) common/amount.o common/autodata.o common/bech32.o common/bigsize.o common/configdir.o common/derive_basepoints.o common/descriptor_checksum.o common/hsm_encryption.o common/node_id.o common/type_to_string.o common/version.o wire/fromwire.o wire/towire.o
|
||||
|
||||
tools/lightning-hsmtool: tools/hsmtool
|
||||
cp $< $@
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#ifndef LIGHTNING_WALLET_DB_COMMON_H
|
||||
#define LIGHTNING_WALLET_DB_COMMON_H
|
||||
#include "config.h"
|
||||
#include <ccan/autodata/autodata.h>
|
||||
#include <ccan/list/list.h>
|
||||
#include <ccan/short_types/short_types.h>
|
||||
#include <common/autodata.h>
|
||||
|
||||
/* For testing, we want to catch fatal messages. */
|
||||
#ifndef db_fatal
|
||||
|
|
|
@ -7,6 +7,7 @@ ALL_TEST_PROGRAMS += $(WALLET_TEST_PROGRAMS)
|
|||
|
||||
WALLET_TEST_COMMON_OBJS := \
|
||||
common/amount.o \
|
||||
common/autodata.o \
|
||||
common/base32.o \
|
||||
common/blockheight_states.o \
|
||||
common/channel_type.o \
|
||||
|
|
|
@ -10,6 +10,7 @@ ALL_C_SOURCES += $(WIRE_TEST_SRC)
|
|||
ALL_TEST_PROGRAMS += $(WIRE_TEST_PROGRAMS)
|
||||
|
||||
WIRE_TEST_COMMON_OBJS := \
|
||||
common/autodata.o \
|
||||
common/pseudorand.o \
|
||||
common/setup.o \
|
||||
common/utils.o
|
||||
|
|
Loading…
Add table
Reference in a new issue