From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 11 Dec 2016 16:04:20 -0800 Subject: 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 --- pkg/make/gen.rc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pkg/make/gen.rc (limited to 'pkg/make/gen.rc') diff --git a/pkg/make/gen.rc b/pkg/make/gen.rc new file mode 100644 index 00000000..1c46aa90 --- /dev/null +++ b/pkg/make/gen.rc @@ -0,0 +1,20 @@ +cflags\ + -D HAVE_CONFIG_H\ + -I include\ + -I '$dir' \ + -I '$srcdir' \ + -I '$srcdir'/glob + +lib libglob.a glob/^(glob.c fnmatch.c) + +exe make\ + ar.c arscan.c commands.c default.c dir.c expand.c file.c\ + function.c getopt.c getopt1.c guile.c implicit.c job.c load.c\ + loadapi.c main.c misc.c posixos.c output.c read.c remake.c\ + rule.c signame.c strcache.c variable.c version.c vpath.c\ + hash.c remote-stub.c\ + libglob.a +file bin/make '$outdir'/make 755 +file share/man/man1/make.1 '$srcdir'/make.1 644 + +fetch git -- cgit v1.2.3