summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2017-02-03 01:27:51 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2017-02-03 01:27:51 -0500
commit026a77f92fd89f009eefee19a43c15d416f54cf7 (patch)
tree31363cfeb002ea8bb0872f3d2243796439ca189c /Makefile
parent026a02b995bb0ae456c66c98f14ea0b2b761a1ea (diff)
Rename the Go packages to have a bit more taste.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 2453dbb..f7f51ac 100644
--- a/Makefile
+++ b/Makefile
@@ -75,21 +75,21 @@ $(outdir)/nshd.service: $(var)user $(var)bindir
$(outdir)/nshd.sysusers: $(var)user
$(outdir)/bin/common.rb: $(var)conf_file
-$(outdir)/.gopath/bin/cmd-nshd: \
- $(outdir)/go/cmd-nshd/main.go \
- $(outdir)/go/parabola_hackers/users.go \
- $(outdir)/go/parabola_hackers/passwords.go
-$(outdir)/go/cmd-nshd/main.go: $(var)conf_file
-$(outdir)/go/parabola_hackers/users.go: $(var)bindir
-$(outdir)/go/parabola_hackers/passwords.go: $(var)shadow_file
+$(outdir)/.gopath/bin/nshd: \
+ $(outdir)/go/nshd/main.go \
+ $(outdir)/go/nshd/nshd_files/users.go \
+ $(outdir)/go/nshd/nshd_files/passwords.go
+$(outdir)/go/nshd/main.go: $(var)conf_file
+$(outdir)/go/nshd/nshd_files/users.go: $(var)bindir
+$(outdir)/go/nshd/nshd_files/passwords.go: $(var)shadow_file
# Go: copy out of .gopath
$(outdir)/bin/nshd: \
-$(outdir)/bin/%: $(outdir)/.gopath/bin/cmd-%
+$(outdir)/bin/%: $(outdir)/.gopath/bin/%
cp -T $< $@
# Go: compile+link
-$(outdir)/.gopath/bin/cmd-nshd: \
-$(outdir)/.gopath/bin/cmd-%: FORCE go-generate
+$(outdir)/.gopath/bin/nshd: \
+$(outdir)/.gopath/bin/%: FORCE go-generate
GOPATH=$(abspath $(outdir)/.gopath) go install $(@F)
# C: compile