e120f87083
This means we don't have to manually choose what to link against, which is much of the complexity of our Makefiles: the compiler will automatically use any object files it needs to link. We already do this for ccan as libccan.a, now we have libcommon.a. We don't link against it for *everything*, as some tests require their own versions. Notes: 1. I get rid of the weird plugins/test/Makefile2 (accidental commit?) 2. Many tests change due to update-mocks. 3. In some places I added the missing dependency on the Makefile itself, though most are in the next patch. Before: Total program size: 221366528 Total tests size: 364243856 After: Total program size: 190733656 Total tests size: 337880888 Build time from make clean (RUST=0) (includes building external libs): Before: real 0m38.227000-44.245000(41.8222+/-1.6)s user 3m2.105000-33.696000(23.1442+/-8.4)s sys 0m35.054000-42.269000(39.7231+/-2)s After: real 0m38.944000-40.416000(40.1131+/-0.4)s user 3m6.790000-17.159000(15.0571+/-2.8)s sys 0m35.304000-37.336000(36.8942+/-0.57)s Build time after touch config.vars (RUST=0): Before: real 0m18.928000-22.776000(21.5084+/-1.1)s user 2m8.613000-36.567000(27.7281+/-7.7)s sys 0m20.458000-23.436000(22.3963+/-0.77)s After: real 0m19.831000-21.862000(21.5528+/-0.58)s user 2m15.361000-30.731000(28.4798+/-4.4)s sys 0m21.056000-22.339000(22.0346+/-0.35)s Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> rusty@rusty-Framework:~/devel/cvs/lightni
43 lines
1.4 KiB
Makefile
43 lines
1.4 KiB
Makefile
#! /usr/bin/make
|
|
|
|
CONNECTD_HEADERS := connectd/connectd_wiregen.h \
|
|
connectd/connectd_gossipd_wiregen.h \
|
|
connectd/connectd.h \
|
|
connectd/peer_exchange_initmsg.h \
|
|
connectd/handshake.h \
|
|
connectd/gossip_store.h \
|
|
connectd/gossip_rcvd_filter.h \
|
|
connectd/queries.h \
|
|
connectd/multiplex.h \
|
|
connectd/netaddress.h \
|
|
connectd/onion_message.h \
|
|
connectd/tor_autoservice.h \
|
|
connectd/tor.h
|
|
|
|
CONNECTD_SRC := $(CONNECTD_HEADERS:.h=.c) connectd/connectd.c
|
|
|
|
CONNECTD_OBJS := $(CONNECTD_SRC:.c=.o)
|
|
$(CONNECTD_OBJS): $(CONNECTD_HEADERS)
|
|
|
|
WEBSOCKETD_HEADERS := connectd/sha1.h
|
|
WEBSOCKETD_SRC := $(WEBSOCKETD_HEADERS:.h=.c) connectd/websocketd.c
|
|
|
|
WEBSOCKETD_OBJS := $(WEBSOCKETD_SRC:.c=.o)
|
|
$(WEBSOCKETD_OBJS): $(WEBSOCKETD_HEADERS)
|
|
|
|
# Make sure these depend on everything.
|
|
ALL_C_SOURCES += $(CONNECTD_SRC) $(WEBSOCKETD_SRC)
|
|
ALL_C_HEADERS += $(CONNECTD_HEADERS) $(WEBSOCKETD_HEADERS)
|
|
ALL_PROGRAMS += lightningd/lightning_connectd
|
|
ALL_PROGRAMS += lightningd/lightning_websocketd
|
|
|
|
# Here's what lightningd depends on
|
|
LIGHTNINGD_CONTROL_HEADERS += connectd/connectd_wiregen.h
|
|
LIGHTNINGD_CONTROL_OBJS += connectd/connectd_wiregen.o
|
|
|
|
lightningd/lightning_connectd: $(CONNECTD_OBJS) $(HSMD_CLIENT_OBJS) gossipd/gossipd_wiregen.o gossipd/gossip_store_wiregen.o libcommon.a
|
|
|
|
lightningd/lightning_websocketd: $(WEBSOCKETD_OBJS) libcommon.a
|
|
|
|
include connectd/test/Makefile
|