From 2dab95eced1e10ebf184d9cf86de50afed51fb5b Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sun, 14 Aug 2016 14:17:35 +0200
Subject: [PATCH] Move the em_code headers into the em_code module.

---
 modules/src/em_code/build.lua          | 15 +++++++++++++--
 modules/{h => src/em_code}/em_code.h   |  0
 modules/{h => src/em_code}/em_codeCE.h |  0
 modules/{h => src/em_code}/em_codeO.h  |  0
 modules/src/em_mes/build.lua           |  2 +-
 modules/src/read_em/build.lua          |  2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)
 rename modules/{h => src/em_code}/em_code.h (100%)
 rename modules/{h => src/em_code}/em_codeCE.h (100%)
 rename modules/{h => src/em_code}/em_codeO.h (100%)

diff --git a/modules/src/em_code/build.lua b/modules/src/em_code/build.lua
index e0218c009..a1316df2f 100644
--- a/modules/src/em_code/build.lua
+++ b/modules/src/em_code/build.lua
@@ -12,6 +12,17 @@ normalrule {
 	}
 }
 
+clibrary {
+    name = "headers",
+    srcs = {},
+    hdrs = {
+        "+em_code_ek_h",
+        "./em_code.h",
+        "./em_codeCE.h",
+        "./em_codeO.h",
+    }
+}
+
 local function build_variant(code, cflags)
 	clibrary {
 		name = "lib_"..code,
@@ -68,10 +79,10 @@ local function build_variant(code, cflags)
 			"./ucon.c",
 		},
 		hdrs = {
-			"+em_code_ek_h"
+            "+headers"
 		},
 		deps = {
-			"+em_code_ek_h",
+			"+headers",
 			"h+emheaders",
 			"h+local",
 			"modules+headers",
diff --git a/modules/h/em_code.h b/modules/src/em_code/em_code.h
similarity index 100%
rename from modules/h/em_code.h
rename to modules/src/em_code/em_code.h
diff --git a/modules/h/em_codeCE.h b/modules/src/em_code/em_codeCE.h
similarity index 100%
rename from modules/h/em_codeCE.h
rename to modules/src/em_code/em_codeCE.h
diff --git a/modules/h/em_codeO.h b/modules/src/em_code/em_codeO.h
similarity index 100%
rename from modules/h/em_codeO.h
rename to modules/src/em_code/em_codeO.h
diff --git a/modules/src/em_mes/build.lua b/modules/src/em_mes/build.lua
index 3c5b2f03e..b094f4a84 100644
--- a/modules/src/em_mes/build.lua
+++ b/modules/src/em_mes/build.lua
@@ -4,7 +4,7 @@ clibrary {
 	deps = {
 		"h+emheaders",
 		"modules+headers",
-		"modules/src/em_code+em_code_ek_h",
+		"modules/src/em_code+headers",
 		"modules/src/em_data+lib",
 	}
 }
diff --git a/modules/src/read_em/build.lua b/modules/src/read_em/build.lua
index 767dc9f87..f559831bd 100644
--- a/modules/src/read_em/build.lua
+++ b/modules/src/read_em/build.lua
@@ -51,7 +51,7 @@ local function variant(name, cflags)
 			"h+emheaders",
 			"modules+headers",
 			"modules/src/alloc+lib",
-			"modules/src/em_code+em_code_ek_h",
+			"modules/src/em_code+headers",
 			"modules/src/em_data+lib",
 			"modules/src/system+lib",
 		}