Skip to content

Commit fe0d820

Browse files
committed
Makefile: clean up a little.
Make cdump-enumstr use libccan.a, rather than explicit ccan object: it's the last one. And mark submodcheck phony, as it is. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
1 parent 85e97bf commit fe0d820

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ CCAN_OBJS := \
9898
ccan-bitmap.o \
9999
ccan-bitops.o \
100100
ccan-breakpoint.o \
101+
ccan-cdump.o \
101102
ccan-closefrom.o \
102103
ccan-crc32c.o \
103104
ccan-crypto-hmac.o \
@@ -223,8 +224,6 @@ CCAN_HEADERS := \
223224
$(CCANDIR)/ccan/typesafe_cb/typesafe_cb.h \
224225
$(CCANDIR)/ccan/utf8/utf8.h
225226

226-
CDUMP_OBJS := ccan-cdump.o ccan-strmap.o
227-
228227
BOLT_GEN := tools/generate-wire.py
229228
WIRE_GEN := $(BOLT_GEN)
230229

@@ -680,7 +679,7 @@ TAGS:
680679
tags:
681680
$(RM) tags; find * -name test -type d -prune -o \( -name '*.[ch]' -o -name '*.py' \) -print0 | xargs -0 ctags --append
682681

683-
ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o $(CDUMP_OBJS) $(CCAN_OBJS)
682+
ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o libccan.a
684683

685684
ALL_PROGRAMS += ccan/ccan/cdump/tools/cdump-enumstr
686685
# Can't add to ALL_OBJS, as that makes a circular dep.

external/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ endif
4242

4343
EXTERNAL_LDLIBS := -L${TARGET_DIR} $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS)))
4444

45+
.PHONY: submodcheck
46+
4547
submodcheck: $(FORCE)
4648
ifneq ($(VERSION),)
4749
@tools/refresh-submodules.sh $(SUBMODULES)

0 commit comments

Comments
 (0)