summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--Makefile21
m---------go/git.lukeshu.com/go/libgnulinux (renamed from go/lukeshu.com/git/go/libgnulinux.git)0
m---------go/git.lukeshu.com/go/libnslcd (renamed from go/lukeshu.com/git/go/libnslcd.git)0
m---------go/git.lukeshu.com/go/libsystemd (renamed from go/lukeshu.com/git/go/libsystemd.git)0
5 files changed, 12 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules
index 71877ad..8e9b8d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,11 +2,11 @@
path = go/gopkg.in/yaml.v2
url = https://gopkg.in/yaml.v2/
[submodule "go/git.lukeshu.com/go/libgnulinux"]
- path = go/lukeshu.com/git/go/libgnulinux.git
+ path = go/git.lukeshu.com/go/libgnulinux
url = https://git.lukeshu.com/go/libgnulinux/
[submodule "go/git.lukeshu.com/go/libnslcd"]
- path = go/lukeshu.com/git/go/libnslcd.git
+ path = go/git.lukeshu.com/go/libnslcd
url = https://git.lukeshu.com/go/libnslcd/
[submodule "go/git.lukeshu.com/go/libsystemd"]
- path = go/lukeshu.com/git/go/libsystemd.git
+ path = go/git.lukeshu.com/go/libsystemd
url = https://git.lukeshu.com/go/libsystemd/
diff --git a/Makefile b/Makefile
index 79b21d6..fdb0de1 100644
--- a/Makefile
+++ b/Makefile
@@ -34,15 +34,13 @@ CGO_CPPFLAGS = $(CPPFLAGS) -U_FORTIFY_SOURCE
CGO_CFLAGS = $(CFLAGS) -O0 -Wno-unused-parameter
CGO_ENABLED = 1
-at.subdirs += go/lukeshu.com/git/go/libnslcd.git/proto
-
programs = nshd nshd-setuid nshd-tester common.rb
scripts = $(filter-out %.c %.o $(programs) common.rb common.rb.in,$(notdir $(wildcard $(srcdir)/bin/*)))
-std.gen_files += LICENSE.lgpl-2.1.txt LICENSE.gpl-2.txt LICENSE.apache-2.0.txt
-std.out_files += $(addprefix bin/,$(programs)) nshd.service nshd.sysusers
-std.sys_files += $(addprefix $(bindir)/,$(programs) $(scripts)) $(systemunitdir)/nshd.socket $(systemunitdir)/nshd.service $(sysusersdir)/nshd.conf $(conf_file) $(shadow_file)
-std.clean_files += bin/*.o .gopath/ .tmp* .var* $(_out)
+files.src.gen += LICENSE.lgpl-2.1.txt LICENSE.gpl-2.txt LICENSE.apache-2.0.txt
+files.out.gen += $(addprefix bin/,$(programs)) nshd.service nshd.sysusers
+files.out.int += bin/*.o .gopath/ .tmp* .var*
+files.sys.all += $(addprefix $(bindir)/,$(programs) $(scripts)) $(systemunitdir)/nshd.socket $(systemunitdir)/nshd.service $(sysusersdir)/nshd.conf $(conf_file) $(shadow_file)
$(srcdir)/LICENSE.lgpl-2.1.txt: $(NET)
curl https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt > $@
@@ -53,12 +51,11 @@ $(srcdir)/LICENSE.apache-2.0.txt: $(NET)
$(srcdir)/LICENSE.wtfpl-2.txt: $(NET)
curl http://www.wtfpl.net/txt/copying/ > $@
-_gen += go/lukeshu.com/git/go/libnslcd.git/proto/server/interface_backend.go
-_gen += go/lukeshu.com/git/go/libnslcd.git/proto/server/func_handlerequest.go
-_gen += go/lukeshu.com/git/go/libnslcd.git/proto/server/type_nilbackend.go
-_out += go/parabola_hackers/users.go
-_out += go/parabola_hackers/passwords.go
-_out += go/cmd-nshd/main.go
+files.generate: go-generate
+go-generate:
+ +GOPATH=$$PWD go generate ./...
+.PHONY: go-generate
+
$(outdir)/bin/nshd: \
$(outdir)/bin/%: $(outdir)/.gopath/bin/cmd-%
cp -T $< $@
diff --git a/go/lukeshu.com/git/go/libgnulinux.git b/go/git.lukeshu.com/go/libgnulinux
-Subproject d8c4fd9aef9137b04e4311a1f50024ab88d4c6e
+Subproject d8c4fd9aef9137b04e4311a1f50024ab88d4c6e
diff --git a/go/lukeshu.com/git/go/libnslcd.git b/go/git.lukeshu.com/go/libnslcd
-Subproject b97ad53c80372d3246220b8fdb5a7a4c1a4d3f0
+Subproject b97ad53c80372d3246220b8fdb5a7a4c1a4d3f0
diff --git a/go/lukeshu.com/git/go/libsystemd.git b/go/git.lukeshu.com/go/libsystemd
-Subproject 89efdfbee5f9a22f9dd1083f7a383daba54d4f1
+Subproject 89efdfbee5f9a22f9dd1083f7a383daba54d4f1