Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

4 files changed, 58 insertions, 0 deletions

diff --git a/pkg/mc/config.h b/pkg/mc/config.h
new file mode 100644
index 00000000..b00373f7
--- /dev/null
+++ b/pkg/mc/config.h
@@ -0,0 +1,5 @@
+#define Instroot ""
+#define Asmcmd {"as", "-o", NULL}
+#define Objsuffix ".o"
+#define Symprefix ""
+#define Defaultasm Gnugaself
diff --git a/pkg/mc/gen.rc b/pkg/mc/gen.rc
new file mode 100644
index 00000000..a5276dec
--- /dev/null
+++ b/pkg/mc/gen.rc
@@ -0,0 +1,52 @@
+cflags\
+	-I '$outdir' \
+	-I '$srcdir' \
+	-I '$srcdir'/mi\
+	-I '$srcdir'/parse\
+	-I '$srcdir'/util
+
+yacc gram '$srcdir'/parse/gram.y
+build '$outdir'/gram.h copy '$outdir'/gram.tab.h
+
+lib libparse.a -d '$outdir'/gram.h '$outdir'/gram.tab.c parse/^(\
+	dump.c\
+	err.c\
+	export.c\
+	fold.c\
+	infer.c\
+	names.c\
+	node.c\
+	specialize.c\
+	stab.c\
+	tok.c\
+	type.c\
+	use.c\
+)
+lib libmi.a mi/^(cfg.c flatten.c dfcheck.c match.c reaching.c)
+lib libutil.a util/^(alloc.c bitset.c htab.c pack.c util.c)
+
+exe bin/6m 6/^(\
+	blob.c\
+	gen.c\
+	gengas.c\
+	genp9.c\
+	isel.c\
+	locs.c\
+	main.c\
+	ra.c\
+	peep.c\
+	simp.c\
+	typeinfo.c\
+) libmi.a libparse.a libutil.a
+file bin/6m '$outdir'/bin/6m 755
+file share/man/man1/mc.1 '$srcdir'/doc/mc.1 644
+
+exe bin/muse muse/muse.c libparse.a libutil.a
+file bin/muse '$outdir'/bin/muse 755
+file share/man/man1/muse.1 '$srcdir'/doc/muse.1 644
+
+build '$outdir'/_myrrt.s cat '$srcdir'/rt/^(start-linux.s common.s abort-linux.s)
+build '$outdir'/_myrrt.o as '$outdir'/_myrrt.s
+file lib/myr/_myrrt.o '$outdir'/_myrrt.o 644
+
+fetch git
diff --git a/pkg/mc/rev b/pkg/mc/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/mc/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/mc/src b/pkg/mc/src
new file mode 160000
+Subproject faf16f0242436077c86358ccbe1a8d93966fdff