From f8ba7ef9626808ff0abe1a226b513043f159e504 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 24 Jun 2018 20:32:59 +0200 Subject: [PATCH] Move the Modula-2 library includes into a directory in lang/m2 where they belong. --- lang/m2/comp/build.lua | 1 + lang/m2/include/build.lua | 4 ++++ {h => lang/m2/include}/m2_traps.h | 0 lang/m2/libm2/build.lua | 1 + 4 files changed, 6 insertions(+) create mode 100644 lang/m2/include/build.lua rename {h => lang/m2/include}/m2_traps.h (100%) diff --git a/lang/m2/comp/build.lua b/lang/m2/comp/build.lua index 490947508..0c60ffbab 100644 --- 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 index 000000000..24f43084a --- /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 dd8968338..2efe707ae 100644 --- 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 } } -- 2.34.1