From ce3b72e371b67e4674cac843d4434b20cafbf206 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Thu, 27 Jul 2017 18:32:43 +0900
Subject: [PATCH] meson build generics - ooops. missed files. add now

---
 meson.build             |  2 ++
 src/modules/meson.build | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/modules/meson.build

diff --git a/meson.build b/meson.build
index 85b84baf9..8a14c6045 100644
--- a/meson.build
+++ b/meson.build
@@ -404,8 +404,10 @@ module_includes2 = [ '../..', '../bin', '../bin/efx' ]
 module_deps = [deps_e, dep_dl]
 
 subdir('src/modules')
+#### the below now use the gneric build above
 #subdir('src/modules/ibar')
 #subdir('src/modules/clock')
+
 subdir('src/modules/pager')
 subdir('src/modules/pager_plain')
 subdir('src/modules/battery')
diff --git a/src/modules/meson.build b/src/modules/meson.build
new file mode 100644
index 000000000..118d0d9a2
--- /dev/null
+++ b/src/modules/meson.build
@@ -0,0 +1,37 @@
+mods = [
+  'clock',
+  'ibar'
+]
+
+foreach m: mods
+  subdir(m)
+
+  _module = m
+  _opt    = m
+  _conf   = 'USE_MODULE_' + m.to_upper()
+  _src = [ ]
+  foreach s: src
+    _src += [ join_paths(m, s) ]
+  endforeach
+  _icon = [
+    join_paths(m, 'e-module-' + _module + '.edj'),
+    join_paths(m, 'module.desktop')
+  ]
+  _dir     = join_paths(dir_module_e, _module)
+  _dir_bin = join_paths(_dir, module_arch)
+
+  if get_option(_opt) == true
+    config_h.set(_conf, '1')
+    module_files += join_paths(_dir_bin, _module + '.so')
+    install_data(_icon, install_dir: _dir)
+    _inc = include_directories(module_includes2,
+                               join_paths('.', m))
+    shared_module(_module, _src,
+                  include_directories: _inc,
+                  name_prefix        : '',
+                  dependencies       : module_deps,
+                  install_dir        : _dir_bin,
+                  install            : true
+                 )
+  endif
+endforeach