commit 7714d125e5a604d2d74872aa13cdfc61ea5a3b5e parent ab3416055ed506c5bc2b691cd064b329042ad512 Author: William Casarin <jb55@jb55.com> Date: Sun, 16 Jan 2022 09:44:24 -0800 fix buggy submodule check Diffstat:
| M | Makefile | | | 19 | +++++++++---------- |
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile @@ -2,18 +2,17 @@ CFLAGS=-Wall -g -Og -Ideps/secp256k1/include -Ideps/libsodium/src/libsodium/include -Ideps LDFLAGS= -SUBMODULES = \ - deps/libsodium \ - deps/secp256k1 - ARS=deps/secp256k1/.libs/libsecp256k1.a deps/libsodium/src/libsodium/.libs/libsodium.a OBJS=sha256.o hkdf.o hmac.o sha512.o lnsocket.o error.o handshake.o DEPS=$(OBJS) config.h all: test -submodcheck: $(FORCE) - @tools/refresh-submodules.sh $(SUBMODULES) +deps/libsodium/.git: + @tools/refresh-submodules.sh deps/libsodium + +deps/secp256k1/.git: + @tools/refresh-submodules.sh deps/secp256k1 config.h: configurator ./configurator > $@ @@ -29,15 +28,15 @@ deps/secp256k1/src/libsecp256k1-config.h: deps/secp256k1/configure cd deps/secp256k1; \ ./configure --enable-module-ecdh -deps/libsodium/src/config.status: deps/libsodium/configure +deps/libsodium/config.status: deps/libsodium/configure cd deps/libsodium; \ ./configure -deps/secp256k1/configure: submodcheck +deps/secp256k1/configure: deps/secp256k1/.git cd deps/secp256k1; \ ./autogen.sh -deps/libsodium/configure: submodcheck +deps/libsodium/configure: deps/libsodium/.git cd deps/libsodium; \ ./autogen.sh @@ -45,7 +44,7 @@ deps/secp256k1/.libs/libsecp256k1.a: deps/secp256k1/src/libsecp256k1-config.h cd deps/secp256k1; \ make -j2 libsecp256k1.la -deps/libsodium/src/libsodium/.libs/libsodium.a: deps/libsodium/src/config.status +deps/libsodium/src/libsodium/.libs/libsodium.a: deps/libsodium/config.status cd deps/libsodium/src/libsodium; \ make -j2 libsodium.la