From 84dbb723d5bc4119b336ed3444a243063b1e959c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 4 Feb 2017 17:56:49 -0500
Subject: nshd: Centralize all config-var substitutions into a `paths.go`.

I'm tired of accidentally editing the wrong file.
---
 Makefile | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f1839b1..670d5ba 100644
--- a/Makefile
+++ b/Makefile
@@ -85,16 +85,9 @@ $(outdir)/nshd.service: $(var.)user $(var.)bindir
 $(outdir)/nshd.sysusers: $(var.)user
 $(outdir)/bin/common.rb: $(var.)conf_file
 
-$(outdir)/go/src/nshd/main.go: $(var.)conf_file
-$(outdir)/go/src/nshd/nshd_files/users.go: $(var.)bindir
-$(outdir)/go/src/nshd/nshd_files/passwords.go: $(var.)shadow_file
-
-goconf = \
-  $(outdir)/go/src/nshd/main.go \
-  $(outdir)/go/src/nshd/nshd_files/users.go \
-  $(outdir)/go/src/nshd/nshd_files/passwords.go
-$(outdir)/go/bin/nshd: $(goconf) $(outdir)/$(files.generate)
-files.out.all += $(goconf)
+$(outdir)/go/src/nshd/nshd_files/paths.go: $(var.)bindir $(var.)conf_file $(var.)shadow_file
+$(outdir)/go/bin/nshd: go-generate $(outdir)/go/src/nshd/nshd_files/paths.go
+files.out.all += $(outdir)/go/src/nshd/nshd_files/paths.go
 
 
 # Install
-- 
cgit v1.2.2