From 026a77f92fd89f009eefee19a43c15d416f54cf7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 3 Feb 2017 01:27:51 -0500 Subject: Rename the Go packages to have a bit more taste. --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.2