From 4d24666432a4a01a67ed9b993c912f44b4cfe0a8 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sun, 14 Aug 2016 14:09:38 +0200
Subject: [PATCH] Move util/data into modules/src/em_data, for consistency with
 the other modules.

---
 lang/basic/src/build.lua                      | 2 +-
 lang/cem/cemcom.ansi/build.lua                | 8 ++++----
 lang/m2/comp/build.lua                        | 6 +++---
 lang/pc/comp/build.lua                        | 6 +++---
 mach/proto/ncg/build.lua                      | 2 +-
 modules/src/em_code/build.lua                 | 2 +-
 {util/data => modules/src/em_data}/.distr     | 0
 {util/data => modules/src/em_data}/build.lua  | 2 +-
 {util/data => modules/src/em_data}/build.mk   | 0
 {util/data => modules/src/em_data}/em_ptyp.c  | 0
 {util/data => modules/src/em_data}/new_table  | 0
 {util/data => modules/src/em_data}/proto.make | 0
 modules/src/em_mes/build.lua                  | 2 +-
 modules/src/read_em/build.lua                 | 2 +-
 util/misc/build.lua                           | 4 ++--
 util/ncgg/build.lua                           | 2 +-
 util/opt/build.lua                            | 4 ++--
 17 files changed, 21 insertions(+), 21 deletions(-)
 rename {util/data => modules/src/em_data}/.distr (100%)
 rename {util/data => modules/src/em_data}/build.lua (96%)
 rename {util/data => modules/src/em_data}/build.mk (100%)
 rename {util/data => modules/src/em_data}/em_ptyp.c (100%)
 rename {util/data => modules/src/em_data}/new_table (100%)
 rename {util/data => modules/src/em_data}/proto.make (100%)

diff --git a/lang/basic/src/build.lua b/lang/basic/src/build.lua
index 001ca037a..f4d6b94a8 100644
--- a/lang/basic/src/build.lua
+++ b/lang/basic/src/build.lua
@@ -30,11 +30,11 @@ cprogram {
 		"modules+headers",
 		"modules/src/alloc+lib",
 		"modules/src/em_code+lib_k",
+		"modules/src/em_data+lib",
 		"modules/src/em_mes+lib",
 		"modules/src/print+lib",
 		"modules/src/string+lib",
 		"modules/src/system+lib",
-		"util/data+em_data",
 	}
 }
 
diff --git a/lang/cem/cemcom.ansi/build.lua b/lang/cem/cemcom.ansi/build.lua
index fe0f70d25..670c73abf 100644
--- a/lang/cem/cemcom.ansi/build.lua
+++ b/lang/cem/cemcom.ansi/build.lua
@@ -139,12 +139,14 @@ cprogram {
 	},
 	deps = {
 		"./*.h",
-		"+parameters",
-		"+nextlib",
 		"+llgen",
+		"+nextlib",
+		"+parameters",
 		"h+emheaders",
+		"modules+headers",
 		"modules/src/alloc+lib",
 		"modules/src/em_code+lib_k",
+		"modules/src/em_data+lib",
 		"modules/src/em_mes+lib",
 		"modules/src/flt_arith+lib",
 		"modules/src/idf+lib",
@@ -152,8 +154,6 @@ cprogram {
 		"modules/src/print+lib",
 		"modules/src/string+lib",
 		"modules/src/system+lib",
-		"modules+headers",
-		"util/data+em_data",
 	},
 }
 
diff --git a/lang/m2/comp/build.lua b/lang/m2/comp/build.lua
index fde8442ae..95c4a30d7 100644
--- a/lang/m2/comp/build.lua
+++ b/lang/m2/comp/build.lua
@@ -114,14 +114,14 @@ cprogram {
 		"modules+headers",
 		"modules/src/alloc+lib",
 		"modules/src/em_code+lib_k",
+		"modules/src/em_data+lib",
+		"modules/src/em_mes+lib",
 		"modules/src/flt_arith+lib",
 		"modules/src/idf+lib",
 		"modules/src/input+lib",
+		"modules/src/print+lib",
 		"modules/src/string+lib",
 		"modules/src/system+lib",
-		"modules/src/print+lib",
-		"modules/src/em_mes+lib",
-		"util/data+em_data",
 	}
 }
 
diff --git a/lang/pc/comp/build.lua b/lang/pc/comp/build.lua
index 8b058345b..a2cb9accb 100644
--- a/lang/pc/comp/build.lua
+++ b/lang/pc/comp/build.lua
@@ -114,14 +114,14 @@ cprogram {
 		"modules+headers",
 		"modules/src/alloc+lib",
 		"modules/src/em_code+lib_k",
+		"modules/src/em_data+lib",
+		"modules/src/em_mes+lib",
 		"modules/src/flt_arith+lib",
 		"modules/src/idf+lib",
 		"modules/src/input+lib",
+		"modules/src/print+lib",
 		"modules/src/string+lib",
 		"modules/src/system+lib",
-		"modules/src/print+lib",
-		"modules/src/em_mes+lib",
-		"util/data+em_data",
 	},
 	vars = {
 		["+cflags"] = "-DSTATIC=static"
diff --git a/mach/proto/ncg/build.lua b/mach/proto/ncg/build.lua
index 09b3b7385..e2345ca0c 100644
--- a/mach/proto/ncg/build.lua
+++ b/mach/proto/ncg/build.lua
@@ -33,7 +33,7 @@ definerule("build_ncg",
 				"modules+headers",
 				"modules/src/flt_arith+lib",
 				"modules/src/object+lib",
-				"util/data+em_data",
+				"modules/src/em_data+lib",
 				headers,
 				tables, -- for .h file
 			}
diff --git a/modules/src/em_code/build.lua b/modules/src/em_code/build.lua
index b530f2a51..e0218c009 100644
--- a/modules/src/em_code/build.lua
+++ b/modules/src/em_code/build.lua
@@ -76,8 +76,8 @@ local function build_variant(code, cflags)
 			"h+local",
 			"modules+headers",
 			"modules/src/alloc+lib",
+			"modules/src/em_data+lib",
 			"modules/src/system+lib",
-			"util/data+em_data",
 		},
 		vars = {
 			["+cflags"] = cflags
diff --git a/util/data/.distr b/modules/src/em_data/.distr
similarity index 100%
rename from util/data/.distr
rename to modules/src/em_data/.distr
diff --git a/util/data/build.lua b/modules/src/em_data/build.lua
similarity index 96%
rename from util/data/build.lua
rename to modules/src/em_data/build.lua
index aca670177..20312201d 100644
--- a/util/data/build.lua
+++ b/modules/src/em_data/build.lua
@@ -21,7 +21,7 @@ local generated = normalrule {
 }
 
 clibrary {
-	name = "em_data",
+	name = "lib",
 	srcs = concat(
 		"./em_ptyp.c",
 		matching(filenamesof(generated), "%.c$")
diff --git a/util/data/build.mk b/modules/src/em_data/build.mk
similarity index 100%
rename from util/data/build.mk
rename to modules/src/em_data/build.mk
diff --git a/util/data/em_ptyp.c b/modules/src/em_data/em_ptyp.c
similarity index 100%
rename from util/data/em_ptyp.c
rename to modules/src/em_data/em_ptyp.c
diff --git a/util/data/new_table b/modules/src/em_data/new_table
similarity index 100%
rename from util/data/new_table
rename to modules/src/em_data/new_table
diff --git a/util/data/proto.make b/modules/src/em_data/proto.make
similarity index 100%
rename from util/data/proto.make
rename to modules/src/em_data/proto.make
diff --git a/modules/src/em_mes/build.lua b/modules/src/em_mes/build.lua
index a3c0173cc..3c5b2f03e 100644
--- a/modules/src/em_mes/build.lua
+++ b/modules/src/em_mes/build.lua
@@ -5,7 +5,7 @@ clibrary {
 		"h+emheaders",
 		"modules+headers",
 		"modules/src/em_code+em_code_ek_h",
-		"util/data+em_data",
+		"modules/src/em_data+lib",
 	}
 }
 
diff --git a/modules/src/read_em/build.lua b/modules/src/read_em/build.lua
index 45794bd91..767dc9f87 100644
--- a/modules/src/read_em/build.lua
+++ b/modules/src/read_em/build.lua
@@ -52,8 +52,8 @@ local function variant(name, cflags)
 			"modules+headers",
 			"modules/src/alloc+lib",
 			"modules/src/em_code+em_code_ek_h",
+			"modules/src/em_data+lib",
 			"modules/src/system+lib",
-			"util/data+em_data",
 		}
 	}
 end
diff --git a/util/misc/build.lua b/util/misc/build.lua
index 3b11c6018..556d56b99 100644
--- a/util/misc/build.lua
+++ b/util/misc/build.lua
@@ -15,7 +15,7 @@ cprogram {
 		"modules/src/read_em+lib_ev",
 		"modules/src/string+lib",
 		"modules/src/system+lib",
-		"util/data+em_data",
+		"modules/src/em_data+lib",
 	}
 }
 
@@ -31,7 +31,7 @@ cprogram {
 		"modules/src/read_em+lib_kv",
 		"modules/src/string+lib",
 		"modules/src/system+lib",
-		"util/data+em_data",
+		"modules/src/em_data+lib",
 	}
 }
 
diff --git a/util/ncgg/build.lua b/util/ncgg/build.lua
index 787fd8c3a..b82f3f340 100644
--- a/util/ncgg/build.lua
+++ b/util/ncgg/build.lua
@@ -35,7 +35,7 @@ cprogram {
 		"+cggparser", -- for .h file
 		"+cgglexer", -- for .h file
 		"h+emheaders",
-		"util/data+em_data",
+		"modules/src/em_data+lib",
 	}
 }
 	
diff --git a/util/opt/build.lua b/util/opt/build.lua
index 8a4dc6688..9bcfdcb21 100644
--- a/util/opt/build.lua
+++ b/util/opt/build.lua
@@ -19,7 +19,7 @@ cprogram {
 	deps = {
 		"+flex",
 		"+yacc",
-		"util/data+em_data",
+		"modules/src/em_data+lib",
 	}
 }
 
@@ -63,7 +63,7 @@ local function variant(name, cflags)
 			"modules/src/print+lib",
 			"modules/src/string+lib",
 			"modules/src/system+lib",
-			"util/data+em_data",
+			"modules/src/em_data+lib",
 		},
 		vars = {
 			["+cflags"] = cflags