rename build/ ninja/
Bazel has got dibs on BUILD.
Change-Id: I95ded7d84ffd73b277e15253a52284ddb6f4ab7d
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/304852
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/build.ninja b/build.ninja
index 04af7b8..faed2c6 100644
--- a/build.ninja
+++ b/build.ninja
@@ -1,47 +1,47 @@
builddir = out
-subninja build/clang
-subninja build/clang.O0
-subninja build/clang.sse2
-subninja build/clang.sse41
-subninja build/clang.avx512
-subninja build/clang.lsan
-subninja build/clang.m32
-subninja build/clang.m32-O0
-subninja build/clang.msan
-subninja build/clang.native
-subninja build/clang.portable
-subninja build/clang.tiny
-subninja build/clang.xsan
-subninja build/clang.xsan-portable
+subninja ninja/clang
+subninja ninja/clang.O0
+subninja ninja/clang.sse2
+subninja ninja/clang.sse41
+subninja ninja/clang.avx512
+subninja ninja/clang.lsan
+subninja ninja/clang.m32
+subninja ninja/clang.m32-O0
+subninja ninja/clang.msan
+subninja ninja/clang.native
+subninja ninja/clang.portable
+subninja ninja/clang.tiny
+subninja ninja/clang.xsan
+subninja ninja/clang.xsan-portable
-subninja build/gcc
-subninja build/gcc.O0
-subninja build/gcc.m32
-subninja build/gcc.m32-O0
-subninja build/gcc.native
-subninja build/gcc.portable
-subninja build/gcc.tiny
-subninja build/gcc.xsan
+subninja ninja/gcc
+subninja ninja/gcc.O0
+subninja ninja/gcc.m32
+subninja ninja/gcc.m32-O0
+subninja ninja/gcc.native
+subninja ninja/gcc.portable
+subninja ninja/gcc.tiny
+subninja ninja/gcc.xsan
-subninja build/android
-subninja build/android.fp16
-subninja build/android.nofp16
-subninja build/android.lsan
-subninja build/android.portable
-subninja build/android.tiny
+subninja ninja/android
+subninja ninja/android.fp16
+subninja ninja/android.nofp16
+subninja ninja/android.lsan
+subninja ninja/android.portable
+subninja ninja/android.tiny
-subninja build/android-arm
-subninja build/android-arm.lsan
-subninja build/android-arm.neon-vfpv4
-subninja build/android-arm.neon-vfpv4-O3
-subninja build/android-arm.portable
-subninja build/android-arm.tiny
-subninja build/android-arm.vfpv2
+subninja ninja/android-arm
+subninja ninja/android-arm.lsan
+subninja ninja/android-arm.neon-vfpv4
+subninja ninja/android-arm.neon-vfpv4-O3
+subninja ninja/android-arm.portable
+subninja ninja/android-arm.tiny
+subninja ninja/android-arm.vfpv2
-subninja build/ios
-subninja build/ios.portable
-subninja build/ios.tiny
-subninja build/ios.xsan
+subninja ninja/ios
+subninja ninja/ios.portable
+subninja ninja/ios.tiny
+subninja ninja/ios.xsan
-subninja build/emscripten
+subninja ninja/emscripten
diff --git a/build/android-arm.lsan b/build/android-arm.lsan
deleted file mode 100644
index c9a4f24..0000000
--- a/build/android-arm.lsan
+++ /dev/null
@@ -1,4 +0,0 @@
-mode = .lsan
-extra_cflags = -fsanitize=leak
-extra_ldflags = -fsanitize=leak
-include build/android-arm
diff --git a/build/android-arm.portable b/build/android-arm.portable
deleted file mode 100644
index a075167..0000000
--- a/build/android-arm.portable
+++ /dev/null
@@ -1,3 +0,0 @@
-mode = .portable
-extra_cflags = -DSKCMS_PORTABLE
-include build/android-arm
diff --git a/build/android.lsan b/build/android.lsan
deleted file mode 100644
index b5c9a73..0000000
--- a/build/android.lsan
+++ /dev/null
@@ -1,4 +0,0 @@
-mode = .lsan
-extra_cflags = -fsanitize=leak
-extra_ldflags = -fsanitize=leak
-include build/android
diff --git a/build/android.portable b/build/android.portable
deleted file mode 100644
index aaa9213..0000000
--- a/build/android.portable
+++ /dev/null
@@ -1,3 +0,0 @@
-mode = .portable
-extra_cflags = -DSKCMS_PORTABLE
-include build/android
diff --git a/build/android.tiny b/build/android.tiny
deleted file mode 100644
index 1caaacd..0000000
--- a/build/android.tiny
+++ /dev/null
@@ -1,3 +0,0 @@
-mode = .tiny
-extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/android
diff --git a/build/clang.portable b/build/clang.portable
deleted file mode 100644
index f7dc4f4..0000000
--- a/build/clang.portable
+++ /dev/null
@@ -1,3 +0,0 @@
-mode = .portable
-extra_cflags = -DSKCMS_PORTABLE
-include build/clang
diff --git a/build/gcc.portable b/build/gcc.portable
deleted file mode 100644
index 6c1bdd8..0000000
--- a/build/gcc.portable
+++ /dev/null
@@ -1,3 +0,0 @@
-mode = .portable
-extra_cflags = -DSKCMS_PORTABLE
-include build/gcc
diff --git a/build/ios.tiny b/build/ios.tiny
deleted file mode 100644
index 71ac73d..0000000
--- a/build/ios.tiny
+++ /dev/null
@@ -1,3 +0,0 @@
-mode = .tiny
-extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/ios
diff --git a/infra/bots/bot.py b/infra/bots/bot.py
index 1477f59..1c33d1c 100644
--- a/infra/bots/bot.py
+++ b/infra/bots/bot.py
@@ -34,15 +34,15 @@
xcode_app_path=xcode_app_path))
# Our Mac bot toolchains are too old for LSAN.
- append('skcms/build/clang.lsan', 'disabled = true')
+ append('skcms/ninja/clang.lsan', 'disabled = true')
call('{ninja}/ninja -C skcms -k 0'.format(ninja=ninja))
elif 'linux' in sys.platform:
# Point to clang in our clang_linux package.
clang_linux = os.path.realpath(sys.argv[3])
- append('skcms/build/clang', 'cc = {}/bin/clang '.format(clang_linux))
- append('skcms/build/clang', 'cxx = {}/bin/clang++'.format(clang_linux))
+ append('skcms/ninja/clang', 'cc = {}/bin/clang '.format(clang_linux))
+ append('skcms/ninja/clang', 'cxx = {}/bin/clang++'.format(clang_linux))
# Get an Emscripten environment all set up.
call('git clone https://github.com/emscripten-core/emsdk.git')
@@ -64,13 +64,13 @@
JS_ENGINES = [NODE_JS]
'''.format(emscripten_sdk, emscripten_sdk, emscripten_sdk, node)
- append('skcms/build/emscripten',
+ append('skcms/ninja/emscripten',
'cc = env EM_CONFIG={} {}/upstream/emscripten/emcc'.format(
em_config, emscripten_sdk))
- append('skcms/build/emscripten',
+ append('skcms/ninja/emscripten',
'cxx = env EM_CONFIG={} {}/upstream/emscripten/em++'.format(
em_config, emscripten_sdk))
- append('skcms/build/emscripten',
+ append('skcms/ninja/emscripten',
'node = {}'.format(node))
call('{ninja}/ninja -C skcms -k 0'.format(ninja=ninja))
diff --git a/msvs.ninja b/msvs.ninja
index 611c95f..4fd1656 100644
--- a/msvs.ninja
+++ b/msvs.ninja
@@ -1,7 +1,7 @@
builddir = out
-subninja build/msvs
-subninja build/msvs.clang
-subninja build/msvs.clang-fast
-subninja build/msvs.fast
-subninja build/msvs.analyze
+subninja ninja/msvs
+subninja ninja/msvs.clang
+subninja ninja/msvs.clang-fast
+subninja ninja/msvs.fast
+subninja ninja/msvs.analyze
diff --git a/build/android b/ninja/android
similarity index 96%
rename from build/android
rename to ninja/android
index 634303a..4420d22 100644
--- a/build/android
+++ b/ninja/android
@@ -15,4 +15,4 @@
adb shell "cd /data/local/tmp; taskset f ./$in" > $out; $
else touch $out; fi
description = run $in
-include build/common
+include ninja/common
diff --git a/build/android-arm b/ninja/android-arm
similarity index 96%
rename from build/android-arm
rename to ninja/android-arm
index 6446b30..c9fea90 100644
--- a/build/android-arm
+++ b/ninja/android-arm
@@ -15,4 +15,4 @@
adb shell "cd /data/local/tmp; taskset f ./$in" > $out; $
else touch $out; fi
description = run $in
-include build/common
+include ninja/common
diff --git a/build/clang.lsan b/ninja/android-arm.lsan
similarity index 76%
copy from build/clang.lsan
copy to ninja/android-arm.lsan
index 774a8e7..bf205c8 100644
--- a/build/clang.lsan
+++ b/ninja/android-arm.lsan
@@ -1,4 +1,4 @@
mode = .lsan
extra_cflags = -fsanitize=leak
extra_ldflags = -fsanitize=leak
-include build/clang
+include ninja/android-arm
diff --git a/build/android-arm.neon-vfpv4 b/ninja/android-arm.neon-vfpv4
similarity index 69%
rename from build/android-arm.neon-vfpv4
rename to ninja/android-arm.neon-vfpv4
index ef3f972..8129d6a 100644
--- a/build/android-arm.neon-vfpv4
+++ b/ninja/android-arm.neon-vfpv4
@@ -1,3 +1,3 @@
mode = .neon-vfpv4
extra_cflags = -mfpu=neon-vfpv4
-include build/android-arm
+include ninja/android-arm
diff --git a/build/android-arm.neon-vfpv4-O3 b/ninja/android-arm.neon-vfpv4-O3
similarity index 71%
rename from build/android-arm.neon-vfpv4-O3
rename to ninja/android-arm.neon-vfpv4-O3
index 409b566..d144011 100644
--- a/build/android-arm.neon-vfpv4-O3
+++ b/ninja/android-arm.neon-vfpv4-O3
@@ -1,3 +1,3 @@
mode = .neon-vfpv4-O3
extra_cflags = -mfpu=neon-vfpv4 -O3
-include build/android-arm
+include ninja/android-arm
diff --git a/build/ios.portable b/ninja/android-arm.portable
similarity index 68%
copy from build/ios.portable
copy to ninja/android-arm.portable
index 22a1cfa..648e4ab 100644
--- a/build/ios.portable
+++ b/ninja/android-arm.portable
@@ -1,3 +1,3 @@
mode = .portable
extra_cflags = -DSKCMS_PORTABLE
-include build/ios
+include ninja/android-arm
diff --git a/build/android-arm.tiny b/ninja/android-arm.tiny
similarity index 79%
rename from build/android-arm.tiny
rename to ninja/android-arm.tiny
index 167af17..ef4684b 100644
--- a/build/android-arm.tiny
+++ b/ninja/android-arm.tiny
@@ -1,3 +1,3 @@
mode = .tiny
extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/android-arm
+include ninja/android-arm
diff --git a/build/android-arm.vfpv2 b/ninja/android-arm.vfpv2
similarity index 65%
rename from build/android-arm.vfpv2
rename to ninja/android-arm.vfpv2
index fd66c5d..c6ad1c9 100644
--- a/build/android-arm.vfpv2
+++ b/ninja/android-arm.vfpv2
@@ -1,3 +1,3 @@
mode = .vfpv2
extra_cflags = -mfpu=vfpv2
-include build/android-arm
+include ninja/android-arm
diff --git a/build/android.fp16 b/ninja/android.fp16
similarity index 78%
rename from build/android.fp16
rename to ninja/android.fp16
index bec99e7..ccd8eee 100644
--- a/build/android.fp16
+++ b/ninja/android.fp16
@@ -1,3 +1,3 @@
mode = .fp16
extra_cflags = -march=armv8.2a+fp16 -DSKCMS_OPT_INTO_NEON_FP16
-include build/android
+include ninja/android
diff --git a/build/clang.lsan b/ninja/android.lsan
similarity index 79%
copy from build/clang.lsan
copy to ninja/android.lsan
index 774a8e7..7cec6b7 100644
--- a/build/clang.lsan
+++ b/ninja/android.lsan
@@ -1,4 +1,4 @@
mode = .lsan
extra_cflags = -fsanitize=leak
extra_ldflags = -fsanitize=leak
-include build/clang
+include ninja/android
diff --git a/build/android.nofp16 b/ninja/android.nofp16
similarity index 72%
rename from build/android.nofp16
rename to ninja/android.nofp16
index 2842f4c..772eb98 100644
--- a/build/android.nofp16
+++ b/ninja/android.nofp16
@@ -1,3 +1,3 @@
mode = .nofp16
extra_cflags = -march=armv8.2a+fp16
-include build/android
+include ninja/android
diff --git a/build/ios.portable b/ninja/android.portable
similarity index 71%
copy from build/ios.portable
copy to ninja/android.portable
index 22a1cfa..2d3d6df 100644
--- a/build/ios.portable
+++ b/ninja/android.portable
@@ -1,3 +1,3 @@
mode = .portable
extra_cflags = -DSKCMS_PORTABLE
-include build/ios
+include ninja/android
diff --git a/build/clang.tiny b/ninja/android.tiny
similarity index 81%
copy from build/clang.tiny
copy to ninja/android.tiny
index c2d63ae..a1d29b9 100644
--- a/build/clang.tiny
+++ b/ninja/android.tiny
@@ -1,3 +1,3 @@
mode = .tiny
extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/clang
+include ninja/android
diff --git a/build/clang b/ninja/clang
similarity index 70%
rename from build/clang
rename to ninja/clang
index 27bad60..ae96f28 100644
--- a/build/clang
+++ b/ninja/clang
@@ -3,5 +3,5 @@
cflags = -fcolor-diagnostics -Weverything
out = out/clang$mode
-include build/local
-include build/common
+include ninja/local
+include ninja/common
diff --git a/build/clang.O0 b/ninja/clang.O0
similarity index 66%
rename from build/clang.O0
rename to ninja/clang.O0
index 4aba860..1c8fb67 100644
--- a/build/clang.O0
+++ b/ninja/clang.O0
@@ -1,3 +1,3 @@
mode = .O0
extra_cflags = -O0
-include build/clang
+include ninja/clang
diff --git a/build/clang.avx512 b/ninja/clang.avx512
similarity index 90%
rename from build/clang.avx512
rename to ninja/clang.avx512
index cb1225e..95ec3e6 100644
--- a/build/clang.avx512
+++ b/ninja/clang.avx512
@@ -1,5 +1,5 @@
mode = .avx512
extra_cflags = -march=skylake-avx512
-include build/clang
+include ninja/clang
disabled = (uname | grep -q Darwin && sysctl machdep.cpu.leaf7_features | grep -qv AVX512F || grep flags /proc/cpuinfo | grep -vq avx512f)
diff --git a/build/clang.lsan b/ninja/clang.lsan
similarity index 80%
rename from build/clang.lsan
rename to ninja/clang.lsan
index 774a8e7..b193c48 100644
--- a/build/clang.lsan
+++ b/ninja/clang.lsan
@@ -1,4 +1,4 @@
mode = .lsan
extra_cflags = -fsanitize=leak
extra_ldflags = -fsanitize=leak
-include build/clang
+include ninja/clang
diff --git a/build/clang.m32 b/ninja/clang.m32
similarity index 83%
rename from build/clang.m32
rename to ninja/clang.m32
index 3ffa994..65828a1 100644
--- a/build/clang.m32
+++ b/ninja/clang.m32
@@ -1,6 +1,6 @@
mode = .m32
extra_cflags = -m32 -msse2
extra_ldflags = -m32
-include build/clang
+include ninja/clang
disabled = (uname | grep -qv Linux)
diff --git a/build/clang.m32-O0 b/ninja/clang.m32-O0
similarity index 84%
rename from build/clang.m32-O0
rename to ninja/clang.m32-O0
index 64be218..435267b 100644
--- a/build/clang.m32-O0
+++ b/ninja/clang.m32-O0
@@ -1,7 +1,7 @@
mode = .m32-O0
extra_cflags = -m32 -msse2 -O0
extra_ldflags = -m32
-include build/clang
+include ninja/clang
disabled = (uname | grep -qv Linux)
diff --git a/build/clang.msan b/ninja/clang.msan
similarity index 86%
rename from build/clang.msan
rename to ninja/clang.msan
index f1dd0ae..a58f3fa 100644
--- a/build/clang.msan
+++ b/ninja/clang.msan
@@ -1,6 +1,6 @@
mode = .msan
extra_cflags = -fsanitize=memory
extra_ldflags = -fsanitize=memory
-include build/clang
+include ninja/clang
disabled = (uname | grep -qv Linux)
diff --git a/build/clang.native b/ninja/clang.native
similarity index 72%
rename from build/clang.native
rename to ninja/clang.native
index 2e080a9..1104e28 100644
--- a/build/clang.native
+++ b/ninja/clang.native
@@ -1,3 +1,3 @@
mode = .native
extra_cflags = -march=native
-include build/clang
+include ninja/clang
diff --git a/build/ios.portable b/ninja/clang.portable
similarity index 73%
copy from build/ios.portable
copy to ninja/clang.portable
index 22a1cfa..c2adea2 100644
--- a/build/ios.portable
+++ b/ninja/clang.portable
@@ -1,3 +1,3 @@
mode = .portable
extra_cflags = -DSKCMS_PORTABLE
-include build/ios
+include ninja/clang
diff --git a/build/clang.sse2 b/ninja/clang.sse2
similarity index 84%
rename from build/clang.sse2
rename to ninja/clang.sse2
index f26ec79..0b48577 100644
--- a/build/clang.sse2
+++ b/ninja/clang.sse2
@@ -1,4 +1,4 @@
mode = .sse2
extra_cflags = -msse2 -mno-sse3 -mno-ssse3 -mno-sse4.1 -DSKCMS_NO_RUNTIME_CPU_DETECTION
-include build/clang
+include ninja/clang
diff --git a/build/clang.sse41 b/ninja/clang.sse41
similarity index 79%
rename from build/clang.sse41
rename to ninja/clang.sse41
index 20c4ed6..86215cf 100644
--- a/build/clang.sse41
+++ b/ninja/clang.sse41
@@ -1,4 +1,4 @@
mode = .sse41
extra_cflags = -msse4.1 -DSKCMS_NO_RUNTIME_CPU_DETECTION
-include build/clang
+include ninja/clang
diff --git a/build/clang.tiny b/ninja/clang.tiny
similarity index 83%
rename from build/clang.tiny
rename to ninja/clang.tiny
index c2d63ae..96eec2c 100644
--- a/build/clang.tiny
+++ b/ninja/clang.tiny
@@ -1,3 +1,3 @@
mode = .tiny
extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/clang
+include ninja/clang
diff --git a/build/clang.xsan b/ninja/clang.xsan
similarity index 88%
rename from build/clang.xsan
rename to ninja/clang.xsan
index 014fec4..32d3d3c 100644
--- a/build/clang.xsan
+++ b/ninja/clang.xsan
@@ -1,4 +1,4 @@
mode = .xsan
extra_cflags = -fsanitize=address,integer,undefined -fno-sanitize-recover=all
extra_ldflags = -fsanitize=address,integer,undefined
-include build/clang
+include ninja/clang
diff --git a/build/clang.xsan-portable b/ninja/clang.xsan-portable
similarity index 89%
rename from build/clang.xsan-portable
rename to ninja/clang.xsan-portable
index b825f41..48ae259 100644
--- a/build/clang.xsan-portable
+++ b/ninja/clang.xsan-portable
@@ -1,4 +1,4 @@
mode = .xsan-portable
extra_cflags = -fsanitize=address,integer,undefined -fno-sanitize-recover=all -DSKCMS_PORTABLE
extra_ldflags = -fsanitize=address,integer,undefined
-include build/clang
+include ninja/clang
diff --git a/build/common b/ninja/common
similarity index 97%
rename from build/common
rename to ninja/common
index 7ed5f5c..bff549f 100644
--- a/build/common
+++ b/ninja/common
@@ -32,4 +32,4 @@
command = $disabled && touch $out || $cxx $ldflags $extra_ldflags $in -ldl -o $out
description = link $out
-include build/targets
+include ninja/targets
diff --git a/build/emscripten b/ninja/emscripten
similarity index 94%
rename from build/emscripten
rename to ninja/emscripten
index d6dcf2d..6961beb 100644
--- a/build/emscripten
+++ b/ninja/emscripten
@@ -14,6 +14,6 @@
else touch $out; fi
description = run $in
-include build/common
+include ninja/common
disabled = (uname | grep -qv Linux)
diff --git a/build/emscripten.simd b/ninja/emscripten.simd
similarity index 74%
rename from build/emscripten.simd
rename to ninja/emscripten.simd
index f8279fa..e88c818 100644
--- a/build/emscripten.simd
+++ b/ninja/emscripten.simd
@@ -2,4 +2,4 @@
extra_cflags = -s SIMD=1
extra_ldflags = -s SIMD=1
-include build/emscripten
+include ninja/emscripten
diff --git a/build/gcc b/ninja/gcc
similarity index 79%
rename from build/gcc
rename to ninja/gcc
index 2823c1f..156c816 100644
--- a/build/gcc
+++ b/ninja/gcc
@@ -3,7 +3,7 @@
cflags = -fdiagnostics-color -Wall -Wextra -ffp-contract=off -fstack-usage
out = out/gcc$mode
-include build/local
-include build/common
+include ninja/local
+include ninja/common
disabled = (uname | grep -qv Linux)
diff --git a/build/gcc.O0 b/ninja/gcc.O0
similarity index 68%
rename from build/gcc.O0
rename to ninja/gcc.O0
index 369d517..3bcb94b 100644
--- a/build/gcc.O0
+++ b/ninja/gcc.O0
@@ -1,3 +1,3 @@
mode = .O0
extra_cflags = -O0
-include build/gcc
+include ninja/gcc
diff --git a/build/gcc.m32 b/ninja/gcc.m32
similarity index 81%
rename from build/gcc.m32
rename to ninja/gcc.m32
index 8f4f416..d738d9a 100644
--- a/build/gcc.m32
+++ b/ninja/gcc.m32
@@ -1,4 +1,4 @@
mode = .m32
extra_cflags = -m32 -msse2 -mfpmath=sse
extra_ldflags = -m32
-include build/gcc
+include ninja/gcc
diff --git a/build/gcc.m32-O0 b/ninja/gcc.m32-O0
similarity index 83%
rename from build/gcc.m32-O0
rename to ninja/gcc.m32-O0
index 4b6f2a2..aac5476 100644
--- a/build/gcc.m32-O0
+++ b/ninja/gcc.m32-O0
@@ -1,4 +1,4 @@
mode = .m32-O0
extra_cflags = -m32 -msse2 -mfpmath=sse -O0
extra_ldflags = -m32
-include build/gcc
+include ninja/gcc
diff --git a/build/gcc.musl b/ninja/gcc.musl
similarity index 86%
rename from build/gcc.musl
rename to ninja/gcc.musl
index 5a2f0eb..8f1e240 100644
--- a/build/gcc.musl
+++ b/ninja/gcc.musl
@@ -1,6 +1,6 @@
mode = .musl
extra_ldflags = -static
-include build/gcc
+include ninja/gcc
cc = env REALGCC=gcc musl-gcc
cxx = env REALGCC=g++ musl-gcc
diff --git a/build/gcc.native b/ninja/gcc.native
similarity index 74%
rename from build/gcc.native
rename to ninja/gcc.native
index de17b3b..e99cda6 100644
--- a/build/gcc.native
+++ b/ninja/gcc.native
@@ -1,3 +1,3 @@
mode = .native
extra_cflags = -march=native
-include build/gcc
+include ninja/gcc
diff --git a/build/ios.portable b/ninja/gcc.portable
similarity index 75%
copy from build/ios.portable
copy to ninja/gcc.portable
index 22a1cfa..e52da39 100644
--- a/build/ios.portable
+++ b/ninja/gcc.portable
@@ -1,3 +1,3 @@
mode = .portable
extra_cflags = -DSKCMS_PORTABLE
-include build/ios
+include ninja/gcc
diff --git a/build/gcc.tiny b/ninja/gcc.tiny
similarity index 84%
rename from build/gcc.tiny
rename to ninja/gcc.tiny
index 282f41f..80351d2 100644
--- a/build/gcc.tiny
+++ b/ninja/gcc.tiny
@@ -1,3 +1,3 @@
mode = .tiny
extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/gcc
+include ninja/gcc
diff --git a/build/gcc.xsan b/ninja/gcc.xsan
similarity index 88%
rename from build/gcc.xsan
rename to ninja/gcc.xsan
index 150ce07..97afdfd 100644
--- a/build/gcc.xsan
+++ b/ninja/gcc.xsan
@@ -1,4 +1,4 @@
mode = .xsan
extra_cflags = -fsanitize=address,undefined -fno-sanitize-recover=all
extra_ldflags = -fsanitize=address,undefined
-include build/gcc
+include ninja/gcc
diff --git a/build/ios b/ninja/ios
similarity index 93%
rename from build/ios
rename to ninja/ios
index 3667b11..1b1bd33 100644
--- a/build/ios
+++ b/ninja/ios
@@ -6,6 +6,6 @@
rule run
command = touch $out
description = skipping $in
-include build/common
+include ninja/common
disabled = (uname | grep -qv Darwin)
diff --git a/build/ios.portable b/ninja/ios.portable
similarity index 75%
rename from build/ios.portable
rename to ninja/ios.portable
index 22a1cfa..9fae408 100644
--- a/build/ios.portable
+++ b/ninja/ios.portable
@@ -1,3 +1,3 @@
mode = .portable
extra_cflags = -DSKCMS_PORTABLE
-include build/ios
+include ninja/ios
diff --git a/build/gcc.tiny b/ninja/ios.tiny
similarity index 84%
copy from build/gcc.tiny
copy to ninja/ios.tiny
index 282f41f..8cd40eb 100644
--- a/build/gcc.tiny
+++ b/ninja/ios.tiny
@@ -1,3 +1,3 @@
mode = .tiny
extra_cflags = -g0 -DNDEBUG -fno-unwind-tables -fno-asynchronous-unwind-tables
-include build/gcc
+include ninja/ios
diff --git a/build/ios.xsan b/ninja/ios.xsan
similarity index 91%
rename from build/ios.xsan
rename to ninja/ios.xsan
index 633d460..da4ee75 100644
--- a/build/ios.xsan
+++ b/ninja/ios.xsan
@@ -1,7 +1,7 @@
mode = .xsan
extra_cflags = -fsanitize=address,integer,undefined -fno-sanitize-recover=all
extra_ldflags = -fsanitize=address,integer,undefined
-include build/ios
+include ninja/ios
cc = /usr/bin/clang
cxx = /usr/bin/clang++
diff --git a/build/local b/ninja/local
similarity index 100%
rename from build/local
rename to ninja/local
diff --git a/build/msvs b/ninja/msvs
similarity index 96%
rename from build/msvs
rename to ninja/msvs
index 1c2f64e..2e350c3 100644
--- a/build/msvs
+++ b/ninja/msvs
@@ -24,4 +24,4 @@
command = link.exe /nologo /DEBUG $extra_ldflags $in /OUT:"$out" /PDB:"$out.pdb"
description = link $out
-include build/targets
+include ninja/targets
diff --git a/build/msvs.analyze b/ninja/msvs.analyze
similarity index 82%
rename from build/msvs.analyze
rename to ninja/msvs.analyze
index 537f824..95a60ac 100644
--- a/build/msvs.analyze
+++ b/ninja/msvs.analyze
@@ -1,4 +1,4 @@
mode = .analyze
extra_cflags = /analyze /RTCcsu /guard:cf
extra_ldflags = /guard:cf
-include build/msvs
+include ninja/msvs
diff --git a/build/msvs.clang b/ninja/msvs.clang
similarity index 73%
rename from build/msvs.clang
rename to ninja/msvs.clang
index 65abd1f..a277e8d 100644
--- a/build/msvs.clang
+++ b/ninja/msvs.clang
@@ -1,5 +1,5 @@
mode = .clang
-include build/msvs
+include ninja/msvs
cl = "../clang_win/bin/clang-cl.exe"
diff --git a/build/msvs.clang-fast b/ninja/msvs.clang-fast
similarity index 81%
rename from build/msvs.clang-fast
rename to ninja/msvs.clang-fast
index f91c1db..d963711 100644
--- a/build/msvs.clang-fast
+++ b/ninja/msvs.clang-fast
@@ -1,6 +1,6 @@
mode = .clang-fast
extra_cflags = /O2 /Zc:inline
-include build/msvs
+include ninja/msvs
cl = "../clang_win/bin/clang-cl.exe"
diff --git a/build/msvs.fast b/ninja/msvs.fast
similarity index 72%
rename from build/msvs.fast
rename to ninja/msvs.fast
index ba0ffc4..e111fd3 100644
--- a/build/msvs.fast
+++ b/ninja/msvs.fast
@@ -1,3 +1,3 @@
mode = .fast
extra_cflags = /O2 /Zc:inline
-include build/msvs
+include ninja/msvs
diff --git a/build/targets b/ninja/targets
similarity index 100%
rename from build/targets
rename to ninja/targets
