npub1xu…padjk on Nostr: commit 953496c7fab3cffaa4899e6bb9c478ecdd58b000 Author: @RandyMcMillan ...

commit 953496c7fab3cffaa4899e6bb9c478ecdd58b000
Author: @RandyMcMillan <[email protected]>
Date: Fri Jan 19 19:57:17 2024 -0500

.gitmodules:deps/gnostr-legit -> legit

.gitmodules
gnostr.mk
deps/gnostr-legit -> legit

diff --git a/.gitmodules b/.gitmodules
index 01c48b8b4..a7adb82e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,11 +28,6 @@
url = https://github.com/gnostr-org/gnostr-git.git
branch = master
ignore = dirty
-[submodule "deps/gnostr-legit"]
- path = deps/gnostr-legit
- url = https://github.com/gnostr-org/gnostr-legit.git
- branch = master
- ignore = dirty
[submodule "deps/gnostr-proxy"]
path = deps/gnostr-proxy
url = https://github.com/gnostr-org/gnostr-proxy.git
@@ -145,3 +140,6 @@
[submodule "gnostr-cli"]
path = cli
url = https://github.com/gnostr-org/gnostr-cli.git
+[submodule "gnostr-legit"]
+ path = legit
+ url = https://github.com/gnostr-org/gnostr-legit.git
diff --git a/gnostr.mk b/gnostr.mk
index d379bd9b1..dc7d4671d 100644
--- a/gnostr.mk
+++ b/gnostr.mk
@@ -23,7 +23,7 @@ ARS := libsecp256k1.a
LIB_ARS := libsecp256k1.a libgit.a

#SUBMODULES = deps/secp256k1
-SUBMODULES = deps/secp256k1 deps/git deps/gnostr-cat deps/gnostr-act deps/openssl deps/gnostr-py deps/gnostr-aio deps/gnostr-legit deps/gnostr-relay deps/gnostr-proxy deps/gnostr-relay ext/boost_1_82_0
+SUBMODULES = deps/secp256k1 deps/git deps/gnostr-cat deps/gnostr-act deps/openssl deps/gnostr-py deps/gnostr-aio legit deps/gnostr-relay deps/gnostr-proxy deps/gnostr-relay ext/boost_1_82_0

VERSION :=$(shell cat version)
export VERSION
@@ -162,7 +162,7 @@ diff-log:
@gnostr-git-reflog -h > tests/gnostr-git-reflog-h.log
@gnostr-relay -h > tests/gnostr-relay-h.log
.PHONY:submodules
-submodules:deps/secp256k1/.git deps/gnostr-git/.git deps/gnostr-cat/.git deps/gnostr-aio/.git deps/gnostr-py/.git deps/gnostr-act/.git deps/gnostr-legit/.git deps/gnostr-proxy/.git #ext/boost_1_82_0/.git ## refresh-submodules
+submodules:deps/secp256k1/.git deps/gnostr-git/.git deps/gnostr-cat/.git deps/gnostr-aio/.git deps/gnostr-py/.git deps/gnostr-act/.git deps/gnostr-proxy/.git #ext/boost_1_82_0/.git ## refresh-submodules
git submodule update --init --recursive

#.PHONY:deps/secp256k1/config.log
@@ -320,13 +320,15 @@ db:
@devtools/refresh-submodules.sh db
@cd db && make build-release install && cd ..

-deps/gnostr-legit/.git:gnostr-git
- @devtools/refresh-submodules.sh deps/gnostr-legit
+.PHONY:legit/.git gnostr-legit legit
+legit/.git:gnostr-git
+ @devtools/refresh-submodules.sh legit
#.PHONY:deps/gnostr-legit/release/gnostr-legit
-deps/gnostr-legit/target/release/gnostr-legit:deps/gnostr-legit/.git
- cd deps/gnostr-legit && \
+legit/target/release/gnostr-legit:legit/.git
+ cd legit && \
make cargo-b-release install
-gnostr-legit:deps/gnostr-legit/target/release/gnostr-legit## gnostr-legit
+legit:gnostr-legit
+gnostr-legit:legit/target/release/gnostr-legit## gnostr-legit
cp $< $@ && exit;
install -v template/gnostr-* /usr/local/bin >/tmp/gnostr-legit.log

diff --git a/deps/gnostr-legit b/legit
similarity index 100%
rename from deps/gnostr-legit
rename to legit