Skip to content

Commit e6dfff3

Browse files
committed
licensing: Make license explicit.
Note that we're BSD-MIT but some of the ccan modules are different licenses. Signed-off-by: Rusty Russell <[email protected]>
1 parent 7cf786f commit e6dfff3

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

LICENSE

-1
This file was deleted.

LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Note: the modules in the ccan/ directory have their own licenses, but
2+
the rest of the code is covered by the following (BSD-MIT) license:
3+
4+
Copyright Rusty Russell (Blockstream) 2015.
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.

Makefile

+5-8
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ CCAN_OBJS := \
7070
ccan-crypto-sha256.o \
7171
ccan-crypto-shachain.o \
7272
ccan-err.o \
73+
ccan-hash.o \
74+
ccan-htable.o \
7375
ccan-ilog.o \
7476
ccan-io-io.o \
7577
ccan-io-poll.o \
@@ -92,11 +94,6 @@ CCAN_OBJS := \
9294
ccan-time.o \
9395
ccan-timer.o
9496

95-
# For tests
96-
CCAN_EXTRA_OBJS := \
97-
ccan-hash.o \
98-
ccan-htable.o
99-
10097
CCAN_HEADERS := \
10198
$(CCANDIR)/config.h \
10299
$(CCANDIR)/ccan/alignof/alignof.h \
@@ -195,7 +192,7 @@ $(PROGRAMS): CFLAGS+=-I.
195192
default: $(PROGRAMS)
196193

197194
# 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)
199196

200197
# Except for CCAN, everything depends on bitcoin/ and core headers.
201198
$(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
268265
$(PROTOCC) lightning.proto --c_out=.
269266

270267
$(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
272269

273270
ccan/config.h: ccan/tools/configurator/configurator
274271
$< > $@
@@ -326,7 +323,7 @@ clean:
326323
$(MAKE) -C secp256k1/ clean || true
327324
$(RM) libsecp256k1.{a,la}
328325
$(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)
330327
$(RM) doc/deployable-lightning.{aux,bbl,blg,dvi,log,out,tex}
331328

332329
ccan-tal.o: $(CCANDIR)/ccan/tal/tal.c

0 commit comments

Comments
 (0)