From 5cbbb9e3773b329f13ea05b97be40a48d5f8d0d6 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 22 Jun 2020 12:39:55 -0700
Subject: Use hyphenated rule names

---
 ninja.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ninja.lua')

diff --git a/ninja.lua b/ninja.lua
index 29e1ed31..56340244 100644
--- a/ninja.lua
+++ b/ninja.lua
@@ -378,14 +378,14 @@ end
 function waylandproto(proto, outs, args)
 	proto = '$srcdir/'..proto
 	if outs.client then
-		build('waylandproto', '$outdir/'..outs.client, proto, {type='client-header'})
+		build('wayland-proto', '$outdir/'..outs.client, proto, {type='client-header'})
 	end
 	if outs.server then
-		build('waylandproto', '$outdir/'..outs.server, proto, {type='server-header'})
+		build('wayland-proto', '$outdir/'..outs.server, proto, {type='server-header'})
 	end
 	if outs.code then
 		local code = '$outdir/'..outs.code
-		build('waylandproto', code, proto, {type='public-code'})
+		build('wayland-proto', code, proto, {type='public-code'})
 		cc(code, {'pkg/wayland/headers'}, args)
 	end
 end
@@ -397,7 +397,7 @@ function fetch(method)
 	else
 		script = '$basedir/scripts/fetch-'..method..'.sh'
 	end
-	build('fetch'..method, '$dir/fetch', {'|', '$dir/ver', script})
+	build('fetch-'..method, '$dir/fetch', {'|', '$dir/ver', script})
 	if basedir ~= '.' then
 		build('phony', '$gendir/fetch', '$dir/fetch')
 	end
@@ -439,7 +439,7 @@ end
 function gitfile(path, mode, src)
 	local out = '$builddir/root.hash/'..path
 	local perm = ('10%04o %s'):format(tonumber(mode, 8), path)
-	build('githash', out, {src, '|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
+	build('git-hash', out, {src, '|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
 		args=perm,
 	})
 	table.insert(pkg.inputs.index, out)
@@ -479,7 +479,7 @@ function sym(path, target)
 		target=target,
 	}
 	local out = '$builddir/root.hash/'..path
-	build('githash', out, {'|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
+	build('git-hash', out, {'|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
 		args=string.format('120000 %s %s', path, target),
 	})
 	table.insert(pkg.inputs.index, out)
-- 
cgit v1.2.3