summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-06-07 00:02:23 -0700
committerMichael Forney <mforney@mforney.org>2016-06-07 00:02:23 -0700
commit324efa470ddc619882b520e7865583c3bc503778 (patch)
treec33ad0c782b663619528cfcfe2c1bd0ecc529606
parenta5ff3a8819777940e02481abcba1086282f4ce6f (diff)
Move cparser and libfirm to devel
-rw-r--r--.gitmodules12
-rw-r--r--core/gen.rc2
-rw-r--r--devel/cparser/gen.rc (renamed from core/cparser/gen.rc)8
m---------devel/cparser/src (renamed from core/cparser/src)0
-rw-r--r--devel/gen.rc2
-rw-r--r--devel/libfirm/.gitignore (renamed from core/libfirm/.gitignore)0
-rw-r--r--devel/libfirm/gen.rc (renamed from core/libfirm/gen.rc)0
m---------devel/libfirm/src (renamed from core/libfirm/src)0
8 files changed, 12 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules
index 19ab17c7..91ad7b9c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
[submodule "core/awk/src"]
path = core/awk/src
url = https://github.com/onetrueawk/awk
-[submodule "core/cparser/src"]
- path = core/cparser/src
- url = http://pp.ipd.kit.edu/git/cparser.git
[submodule "core/curl/src"]
path = core/curl/src
url = https://github.com/curl/curl
@@ -19,9 +16,6 @@
[submodule "core/kbd/src"]
path = core/kbd/src
url = https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git
-[submodule "core/libfirm/src"]
- path = core/libfirm/src
- url = http://pp.ipd.kit.edu/git/libfirm.git
[submodule "core/libressl/src"]
path = core/libressl/src
url = https://github.com/libressl-portable/openbsd
@@ -61,6 +55,12 @@
[submodule "desktop/plan9fonts/src"]
path = desktop/plan9fonts/src
url = https://github.com/rtrn/plan9fonts
+[submodule "devel/cparser/src"]
+ path = devel/cparser/src
+ url = http://pp.ipd.kit.edu/git/cparser.git
+[submodule "devel/libfirm/src"]
+ path = devel/libfirm/src
+ url = http://pp.ipd.kit.edu/git/libfirm.git
[submodule "devel/make/src"]
path = devel/make/src
url = git://git.sv.gnu.org/make.git
diff --git a/core/gen.rc b/core/gen.rc
index 3b91f53d..69e94eb6 100644
--- a/core/gen.rc
+++ b/core/gen.rc
@@ -1,12 +1,10 @@
subgen awk
subgen bzip2
-subgen cparser
subgen curl
subgen file
subgen git
subgen iproute2
subgen kbd
-subgen libfirm
subgen libressl
subgen loksh
subgen mdocml
diff --git a/core/cparser/gen.rc b/devel/cparser/gen.rc
index 5bb5634d..302c011a 100644
--- a/core/cparser/gen.rc
+++ b/devel/cparser/gen.rc
@@ -1,6 +1,6 @@
cflags\
- -I core/libfirm/src/include\
- -I '$builddir'/core/libfirm/include\
+ -I devel/libfirm/src/include\
+ -I '$builddir'/devel/libfirm/include\
-I '$srcdir'/src\
-I '$outdir'
@@ -8,7 +8,7 @@ rule revision_hdr 'echo ''#define cparser_REVISION ""'' >$out.tmp && mv $out.tmp
build '$outdir'/revision.h revision_hdr
srcs=src/^(main.c */*.c)
-for(src in $srcs) cc $src '||' '$outdir'/revision.h phony/core/libfirm/headers
-link cparser $srcs.o '$builddir'/core/libfirm/libfirm.a
+for(src in $srcs) cc $src '||' '$outdir'/revision.h phony/devel/libfirm/headers
+link cparser $srcs.o '$builddir'/devel/libfirm/libfirm.a
file bin/cparser '$outdir'/cparser 755
file share/man/man1/cparser.1 '$srcdir'/cparser.1 644
diff --git a/core/cparser/src b/devel/cparser/src
-Subproject d2a926c5f3b2c475650cb6d66eeed45ab7e31bd
+Subproject d2a926c5f3b2c475650cb6d66eeed45ab7e31bd
diff --git a/devel/gen.rc b/devel/gen.rc
index 0447eb34..19f36303 100644
--- a/devel/gen.rc
+++ b/devel/gen.rc
@@ -1 +1,3 @@
+subgen cparser
+subgen libfirm
subgen make
diff --git a/core/libfirm/.gitignore b/devel/libfirm/.gitignore
index afd86171..afd86171 100644
--- a/core/libfirm/.gitignore
+++ b/devel/libfirm/.gitignore
diff --git a/core/libfirm/gen.rc b/devel/libfirm/gen.rc
index 159d24a4..159d24a4 100644
--- a/core/libfirm/gen.rc
+++ b/devel/libfirm/gen.rc
diff --git a/core/libfirm/src b/devel/libfirm/src
-Subproject 1dfae908f3acf65d0a396ea12333af6c2bca81e
+Subproject 1dfae908f3acf65d0a396ea12333af6c2bca81e