Move the Modula-2 library includes into a directory in lang/m2 where they belong.

diff --git a/lang/m2/comp/build.lua b/lang/m2/comp/build.lua
index 4909475..0c60ffb 100644 (file)
--- a/lang/m2/comp/build.lua
+++ b/lang/m2/comp/build.lua
@@ -111,6 +111,7 @@ cprogram {
                "+real_h",
                "+type_h",
                "h+emheaders",
+               "lang/m2/include+headers",
                "modules+headers",
                "modules/src/alloc+lib",
                "modules/src/data+lib",

diff --git a/lang/m2/include/build.lua b/lang/m2/include/build.lua
new file mode 100644 (file)
index 0000000..24f4308
--- /dev/null
+++ b/lang/m2/include/build.lua
@@ -0,0 +1,4 @@
+clibrary {
+       name = "headers",
+       hdrs = {"./*.h"}
+}

diff --git a/h/m2_traps.h b/lang/m2/include/m2_traps.h
similarity index 100%
rename from h/m2_traps.h
rename to lang/m2/include/m2_traps.h

diff --git a/lang/m2/libm2/build.lua b/lang/m2/libm2/build.lua
index dd89683..2efe707 100644 (file)
--- a/lang/m2/libm2/build.lua
+++ b/lang/m2/libm2/build.lua
@@ -32,6 +32,7 @@ for _, plat in ipairs(vars.plats) do
                        "lang/cem/libcc.ansi/headers+pkg",
                        "plat/"..plat.."/include+pkg",
                        "h+emheaders",
+                       "lang/m2/include+headers",
                },
         vars = { plat = plat }
     }