From 0e0907734c12eb0b70659be15ffd8c161402e6db Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 17 Jun 2016 14:35:35 -0400
Subject: move things src/parabola_hackers{/nslcd_backend,}

---
 Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e28e7f1..38bef66 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ scripts = $(filter-out common.rb common.rb.in,$(notdir $(wildcard $(srcdir)/scri
 std.gen_files += LICENSE.lgpl-2.1.txt LICENSE.gpl-2.txt LICENSE.apache-2.0.txt
 std.out_files += bin/cmd-nshd nshd.service nshd.sysusers scripts/common.rb test/runner
 std.sys_files += $(addprefix $(bindir)/,nshd $(scripts)) $(systemunitdir)/nshd.socket $(systemunitdir)/nshd.service $(sysusersdir)/nshd.conf $(conf_file)
-std.clean_files += test/*.o pkg/ .tmp* .var* src/cmd-nshd/main.go
+std.clean_files += test/*.o pkg/ .tmp* .var* $(_out)
 
 $(srcdir)/LICENSE.lgpl-2.1.txt: $(NET)
 	curl https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt > $@
@@ -55,11 +55,12 @@ $(srcdir)/LICENSE.apache-2.0.txt: $(NET)
 $(srcdir)/LICENSE.wtfpl-2.txt: $(NET)
 	curl http://www.wtfpl.net/txt/copying/ > $@
 
-$(outdir)/bin/cmd-nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/interface_backend.go
-$(outdir)/bin/cmd-nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/func_handlerequest.go
-$(outdir)/bin/cmd-nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/type_nilbackend.go                                                     
-$(outdir)/bin/cmd-nshd: src/cmd-nshd/main.go
-$(outdir)/bin/cmd-nshd: $(call golang.src,$(srcdir)) $(var)conf_file $(var)bindir
+_gen += src/lukeshu.com/git/go/libnslcd.git/proto/server/interface_backend.go
+_gen += src/lukeshu.com/git/go/libnslcd.git/proto/server/func_handlerequest.go
+_gen += src/lukeshu.com/git/go/libnslcd.git/proto/server/type_nilbackend.go
+_out += src/parabola_hackers/load_all_users.go
+_out += src/cmd-nshd/main.go
+$(outdir)/bin/%-nshd: $(call golang.src,$(srcdir)) $(_gen) $(_out)
 	$(call golang.install,$(topsrcdir),cmd-nshd)
 
 $(outdir)/%.o: $(srcdir)/%.c $(var)CC $(var)CPPFLAGS $(var)CFLAGS
@@ -69,10 +70,12 @@ $(outdir)/%: $(outdir)/%.o $(var)CC $(var)LDFLAGS
 
 $(outdir)/%: $(srcdir)/%.in
 	< $< sed $(foreach v,$(patsubst $(var)%,%,$(filter $(var)%,$^)), -e 's|@$v@|$($v)|g' ) > $@
+
 $(outdir)/nshd.service: $(var)user $(var)bindir
 $(outdir)/nshd.sysusers: $(var)user
 $(outdir)/scripts/common.rb: $(var)conf_file
-$(outdir)/src/cmd-nshd/main.go: $(var)conf_file $(var)bindir
+$(outdir)/src/cmd-nshd/main.go: $(var)conf_file
+$(outdir)/src/parabola_hackers/load_all_users.go: $(var)bindir
 
 $(DESTDIR)$(bindir)/%: $(outdir)/bin/cmd-%
 	install -TDm755 $< $@
-- 
cgit v1.2.2