make: split out source files into src folder

19 files changed, 5 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 0213482..6146c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,27 +5,7 @@ PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
 BUILDDIR = build
 
-BINPROGS = \
-	archco \
-	arch-nspawn \
-	archrelease \
-	archbuild \
-	checkpkg \
-	commitpkg \
-	crossrepomove\
-	diffpkg \
-	export-pkgbuild-keys \
-	finddeps \
-	find-libdeps \
-	lddd \
-	makerepropkg \
-	mkarchroot \
-	makechrootpkg \
-	offload-build \
-	rebuildpkgs \
-	sogrep
-BINPROGS := $(addprefix $(BUILDDIR)/bin/,$(BINPROGS))
-
+BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
 MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
 PACMAN_CONFIGS=$(wildcard config/pacman/*)
 SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
@@ -89,6 +69,9 @@ completion: $(COMPLETIONS)
 man: $(MANS)
 
 
+ifneq ($(wildcard *.in),)
+	$(error Legacy in prog file found: $(wildcard *.in) - please migrate to src/*)
+endif
 ifneq ($(wildcard pacman-*.conf),)
 	$(error Legacy pacman config file found: $(wildcard pacman-*.conf) - please migrate to config/pacman/*)
 endif
@@ -112,7 +95,7 @@ $(1)/%: $(2)%.in
 	@bash -O extglob -n "$$@"
 endef
 
-$(eval $(call buildInScript,build/bin,,555))
+$(eval $(call buildInScript,build/bin,src/,555))
 $(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444)))
 
 $(BUILDDIR)/doc/%: doc/%.asciidoc doc/asciidoc.conf doc/footer.asciidoc
diff --git a/arch-nspawn.in b/src/arch-nspawn.in
index 275cff7..275cff7 100644
--- a/arch-nspawn.in
+++ b/src/arch-nspawn.in
diff --git a/archbuild.in b/src/archbuild.in
index e6cf19a..e6cf19a 100644
--- a/archbuild.in
+++ b/src/archbuild.in
diff --git a/archco.in b/src/archco.in
index a93d819..a93d819 100644
--- a/archco.in
+++ b/src/archco.in
diff --git a/archrelease.in b/src/archrelease.in
index 3490ee2..3490ee2 100644
--- a/archrelease.in
+++ b/src/archrelease.in
diff --git a/checkpkg.in b/src/checkpkg.in
index 059f752..059f752 100644
--- a/checkpkg.in
+++ b/src/checkpkg.in
diff --git a/commitpkg.in b/src/commitpkg.in
index 31adcd6..31adcd6 100644
--- a/commitpkg.in
+++ b/src/commitpkg.in
diff --git a/crossrepomove.in b/src/crossrepomove.in
index c028d62..c028d62 100644
--- a/crossrepomove.in
+++ b/src/crossrepomove.in
diff --git a/diffpkg.in b/src/diffpkg.in
index 963f2c6..963f2c6 100644
--- a/diffpkg.in
+++ b/src/diffpkg.in
diff --git a/export-pkgbuild-keys.in b/src/export-pkgbuild-keys.in
index 8697b3d..8697b3d 100644
--- a/export-pkgbuild-keys.in
+++ b/src/export-pkgbuild-keys.in
diff --git a/find-libdeps.in b/src/find-libdeps.in
index e1423b8..e1423b8 100644
--- a/find-libdeps.in
+++ b/src/find-libdeps.in
diff --git a/finddeps.in b/src/finddeps.in
index 05b3530..05b3530 100644
--- a/finddeps.in
+++ b/src/finddeps.in
diff --git a/lddd.in b/src/lddd.in
index 12f8d67..12f8d67 100644
--- a/lddd.in
+++ b/src/lddd.in
diff --git a/makechrootpkg.in b/src/makechrootpkg.in
index 126d1da..126d1da 100644
--- a/makechrootpkg.in
+++ b/src/makechrootpkg.in
diff --git a/makerepropkg.in b/src/makerepropkg.in
index b271f25..b271f25 100644
--- a/makerepropkg.in
+++ b/src/makerepropkg.in
diff --git a/mkarchroot.in b/src/mkarchroot.in
index d199bed..d199bed 100644
--- a/mkarchroot.in
+++ b/src/mkarchroot.in
diff --git a/offload-build.in b/src/offload-build.in
index 9e9d71e..9e9d71e 100644
--- a/offload-build.in
+++ b/src/offload-build.in
diff --git a/rebuildpkgs.in b/src/rebuildpkgs.in
index 164bf08..164bf08 100644
--- a/rebuildpkgs.in
+++ b/src/rebuildpkgs.in
diff --git a/sogrep.in b/src/sogrep.in
index d1ca1a1..d1ca1a1 100644
--- a/sogrep.in
+++ b/src/sogrep.in