Move util/data into modules/src/em_data, for consistency with the other

modules.

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",
 	}
 }
 

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",
 	},
 }
 

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",
 	}
 }
 

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"

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
 			}

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

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$")

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",
 	}
 }
 

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

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",
 	}
 }
 

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",
 	}
 }
 	

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