From c191af11616a3306b8e0a3650b6972eb61d2aba1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 17 Jun 2016 11:49:22 -0400
Subject: rearrange the go packages a bit

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d7cee40..e28e7f1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,9 +42,9 @@ at.subdirs += src/lukeshu.com/git/go/libnslcd.git/proto
 scripts = $(filter-out common.rb common.rb.in,$(notdir $(wildcard $(srcdir)/scripts/*))) common.rb
 
 std.gen_files += LICENSE.lgpl-2.1.txt LICENSE.gpl-2.txt LICENSE.apache-2.0.txt
-std.out_files += bin/nshd nshd.service nshd.sysusers scripts/common.rb test/runner
+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*
+std.clean_files += test/*.o pkg/ .tmp* .var* src/cmd-nshd/main.go
 
 $(srcdir)/LICENSE.lgpl-2.1.txt: $(NET)
 	curl https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt > $@
@@ -55,12 +55,12 @@ $(srcdir)/LICENSE.apache-2.0.txt: $(NET)
 $(srcdir)/LICENSE.wtfpl-2.txt: $(NET)
 	curl http://www.wtfpl.net/txt/copying/ > $@
 
-$(outdir)/bin/nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/interface_backend.go
-$(outdir)/bin/nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/func_handlerequest.go
-$(outdir)/bin/nshd: src/lukeshu.com/git/go/libnslcd.git/proto/server/type_nilbackend.go                                                     
-$(outdir)/bin/nshd: src/nshd/main.go
-$(outdir)/bin/nshd: $(call golang.src,$(srcdir)) $(var)conf_file $(var)bindir
-	$(call golang.install,$(topsrcdir),nshd)
+$(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
+	$(call golang.install,$(topsrcdir),cmd-nshd)
 
 $(outdir)/%.o: $(srcdir)/%.c $(var)CC $(var)CPPFLAGS $(var)CFLAGS
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(filter-out $(var)%,$^)
@@ -72,9 +72,9 @@ $(outdir)/%: $(srcdir)/%.in
 $(outdir)/nshd.service: $(var)user $(var)bindir
 $(outdir)/nshd.sysusers: $(var)user
 $(outdir)/scripts/common.rb: $(var)conf_file
-$(outdir)/src/nshd/main.go: $(var)conf_file $(var)bindir
+$(outdir)/src/cmd-nshd/main.go: $(var)conf_file $(var)bindir
 
-$(DESTDIR)$(bindir)/%: $(outdir)/bin/%
+$(DESTDIR)$(bindir)/%: $(outdir)/bin/cmd-%
 	install -TDm755 $< $@
 $(DESTDIR)$(bindir)/%: $(srcdir)/scripts/%
 	install -TDm755 $< $@
-- 
cgit v1.2.3