mirror of
https://github.com/aljazceru/lightning.git
synced 2025-12-23 00:54:20 +01:00
external: new subdirectory for all external libraries and submodules.
You will want to 'make distclean' after this. I also removed libsecp; we use the one in in libwally anyway. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
committed by
Christian Decker
parent
c6976cd947
commit
f42f34b82d
18
cli/Makefile
18
cli/Makefile
@@ -1,9 +1,6 @@
|
||||
LIGHTNING_CLI_SRC := cli/lightning-cli.c
|
||||
LIGHTNING_CLI_OBJS := $(LIGHTNING_CLI_SRC:.c=.o)
|
||||
|
||||
JSMN_OBJS := daemon/jsmn.o
|
||||
JSMN_HEADERS := daemon/jsmn/jsmn.h
|
||||
|
||||
LIGHTNING_CLI_COMMON_OBJS := \
|
||||
common/configdir.o \
|
||||
common/json.o \
|
||||
@@ -11,20 +8,7 @@ LIGHTNING_CLI_COMMON_OBJS := \
|
||||
|
||||
lightning-cli-all: cli/lightning-cli
|
||||
|
||||
$(LIGHTNINGD_OPENING_OBJS): $(LIGHTNINGD_HEADERS)
|
||||
|
||||
# Git submodules are seriously broken.
|
||||
daemon/jsmn/jsmn.h:
|
||||
git submodule update daemon/jsmn/
|
||||
[ -f $@ ] || git submodule update --init daemon/jsmn/
|
||||
|
||||
# If we tell Make that the above builds both, it runs it twice in
|
||||
# parallel. So we lie :(
|
||||
daemon/jsmn/jsmn.c: daemon/jsmn/jsmn.h
|
||||
[ -f $@ ]
|
||||
|
||||
daemon/jsmn.o: daemon/jsmn/jsmn.c
|
||||
$(COMPILE.c) -DJSMN_STRICT=1 $(OUTPUT_OPTION) $<
|
||||
$(LIGHTNINGD_OPENING_OBJS): $(LIGHTNINGD_HEADERS) $(EXTERNAL_HEADERS)
|
||||
|
||||
$(LIGHTNING_CLI_OBJS) $(JSMN_OBJS): $(JSMN_HEADERS) $(COMMON_HEADERS) $(CCAN_HEADERS)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user