diff options
| author | Michael Forney <mforney@mforney.org> | 2016-04-14 00:21:44 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-04-15 02:10:08 -0700 |
| commit | 20a3b2ad4421763e4b19d7897cc5addecf06898d (patch) | |
| tree | ecc00da23403820c355f5ff81f9da2ae8531f466 /core | |
| parent | b3a4eb3f51f308a1d7fdde8a7cf77f4b8df2f308 (diff) | |
Allow independent generation of ninja files
Diffstat (limited to 'core')
| -rw-r--r-- | core/cparser/gen.rc | 8 | ||||
| -rw-r--r-- | core/file/gen.rc | 2 | ||||
| -rw-r--r-- | core/gen.rc | 11 | ||||
| -rw-r--r-- | core/libfirm/.gitignore | 5 | ||||
| -rw-r--r-- | core/libfirm/gen.rc | 4 | ||||
| -rw-r--r-- | core/loksh/gen.rc | 2 |
6 files changed, 24 insertions, 8 deletions
diff --git a/core/cparser/gen.rc b/core/cparser/gen.rc index ada89217..725e931d 100644 --- a/core/cparser/gen.rc +++ b/core/cparser/gen.rc @@ -1,6 +1,6 @@ cflags\ - -I '$root_srcdir'/core/libfirm/src/include\ - -I '$root_outdir'/core/libfirm\ + -I core/libfirm/src/include\ + -I '$builddir'/core/libfirm\ -I '$srcdir'/src/src\ -I '$outdir' @@ -9,7 +9,7 @@ build '$outdir'/revision.h revision_hdr cd src srcs=src/^( main.c */*.c ) -for(src in $srcs) cc $src '|' '$outdir'/revision.h '||' '$root_outdir/core/libfirm/stamp' -link cparser $srcs.o '$root_outdir'/core/libfirm/libfirm.a +for(src in $srcs) cc $src '|' '$outdir'/revision.h '||' '$builddir/core/libfirm/stamp' +link cparser $srcs.o '$builddir'/core/libfirm/libfirm.a file bin/cparser '$outdir'/cparser 755 file share/man/man1/cparser.1 '$srcdir'/src/cparser.1 644 diff --git a/core/file/gen.rc b/core/file/gen.rc index 83e71b35..6b92f79a 100644 --- a/core/file/gen.rc +++ b/core/file/gen.rc @@ -103,7 +103,7 @@ srcs=(\ \ src/fmtcheck.c\ ) { - for(src in $srcs) cc $src '|' '$outdir/include/magic.h' '||' core/zlib/stamp + for(src in $srcs) cc $src '|' '$outdir/include/magic.h' '||' '$builddir/core/zlib/stamp' ar libmagic.a $srcs.o } diff --git a/core/gen.rc b/core/gen.rc new file mode 100644 index 00000000..428fb488 --- /dev/null +++ b/core/gen.rc @@ -0,0 +1,11 @@ +subgen cparser +subgen file +subgen libfirm +subgen loksh +subgen plan9port +subgen sbase +subgen sinit +subgen skeleton +subgen tz +subgen ubase +subgen zlib diff --git a/core/libfirm/.gitignore b/core/libfirm/.gitignore new file mode 100644 index 00000000..afd86171 --- /dev/null +++ b/core/libfirm/.gitignore @@ -0,0 +1,5 @@ +/TEMPLATE.ninja +/amd64.ninja +/arm.ninja +/ia32.ninja +/sparc.ninja diff --git a/core/libfirm/gen.rc b/core/libfirm/gen.rc index bbfcbee4..8e5bea1e 100644 --- a/core/libfirm/gen.rc +++ b/core/libfirm/gen.rc @@ -51,8 +51,8 @@ for(backend in $backends) { build $"outs $type '$srcdir'/src/ir/be/$backend/$backend^_spec.pl } for(src in $srcs) cc $src '||' '$outdir/stamp' - } >$outdir/$backend.ninja - echo 'subninja $outdir'/$backend.ninja + } >../$backend.ninja + subninja '$srcdir'/$backend.ninja } ar libfirm.a $objs diff --git a/core/loksh/gen.rc b/core/loksh/gen.rc index 59e52b07..cc561e03 100644 --- a/core/loksh/gen.rc +++ b/core/loksh/gen.rc @@ -1,4 +1,4 @@ -cflags -I '$root_srcdir/include' -D_GNU_SOURCE +cflags -I include -D_GNU_SOURCE exe ksh\ alloc.c\ c_ksh.c\ |