@@ -70,6 +70,8 @@ CCAN_OBJS := \
70
70
ccan-crypto-sha256.o \
71
71
ccan-crypto-shachain.o \
72
72
ccan-err.o \
73
+ ccan-hash.o \
74
+ ccan-htable.o \
73
75
ccan-ilog.o \
74
76
ccan-io-io.o \
75
77
ccan-io-poll.o \
@@ -92,11 +94,6 @@ CCAN_OBJS := \
92
94
ccan-time.o \
93
95
ccan-timer.o
94
96
95
- # For tests
96
- CCAN_EXTRA_OBJS := \
97
- ccan-hash.o \
98
- ccan-htable.o
99
-
100
97
CCAN_HEADERS := \
101
98
$(CCANDIR ) /config.h \
102
99
$(CCANDIR ) /ccan/alignof/alignof.h \
@@ -195,7 +192,7 @@ $(PROGRAMS): CFLAGS+=-I.
195
192
default : $(PROGRAMS )
196
193
197
194
# Everything depends on the CCAN headers.
198
- $(CCAN_OBJS) $(CCAN_EXTRA_OBJS) $( CDUMP_OBJS) $(HELPER_OBJS) $(BITCOIN_OBJS) $(TEST_CLI_PROGRAMS:=.o) $(TEST_PROGRAMS:=.o): $(CCAN_HEADERS)
195
+ $(CCAN_OBJS) $(CDUMP_OBJS) $(HELPER_OBJS) $(BITCOIN_OBJS) $(TEST_CLI_PROGRAMS:=.o) $(TEST_PROGRAMS:=.o): $(CCAN_HEADERS)
199
196
200
197
# Except for CCAN, everything depends on bitcoin/ and core headers.
201
198
$(HELPER_OBJS) $(BITCOIN_OBJS) $(TEST_CLI_PROGRAMS:=.o) $(TEST_PROGRAMS:=.o): $(BITCOIN_HEADERS) $(CORE_HEADERS) $(GEN_HEADERS)
@@ -268,7 +265,7 @@ lightning.pb-c.c lightning.pb-c.h: lightning.proto
268
265
$(PROTOCC ) lightning.proto --c_out=.
269
266
270
267
$(TEST_CLI_PROGRAMS ) : % : % .o $(CORE_OBJS ) $(BITCOIN_OBJS ) $(CCAN_OBJS ) $(TEST_CLI_OBJS ) libsecp256k1.a
271
- $(TEST_PROGRAMS ) : % : % .o $(BITCOIN_OBJS ) $(CCAN_OBJS ) $( CCAN_EXTRA_OBJS ) version.o libsecp256k1.a
268
+ $(TEST_PROGRAMS ) : % : % .o $(BITCOIN_OBJS ) $(CCAN_OBJS ) version.o libsecp256k1.a
272
269
273
270
ccan/config.h : ccan/tools/configurator/configurator
274
271
$< > $@
@@ -326,7 +323,7 @@ clean:
326
323
$(MAKE ) -C secp256k1/ clean || true
327
324
$(RM ) libsecp256k1.{a,la}
328
325
$(RM ) $(PROGRAMS ) test-cli/leak-anchor-sigs
329
- $(RM ) bitcoin/* .o * .o $(PROGRAMS:=.o ) $(CCAN_OBJS ) $( CCAN_EXTRA_OBJS )
326
+ $(RM ) bitcoin/* .o * .o $(PROGRAMS:=.o ) $(CCAN_OBJS )
330
327
$(RM ) doc/deployable-lightning.{aux,bbl,blg,dvi,log,out,tex}
331
328
332
329
ccan-tal.o : $(CCANDIR ) /ccan/tal/tal.c
0 commit comments