bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c0e6628651ecc97314af128e763f4e49d0d106bb
commit c0e6628651ecc97314af128e763f4e49d0d106bb
Author: Marcel Hollerbach <marcel-hollerb...@t-online.de>
Date: Tue Aug 8 18:33:11 2017 +0200
meson: port geolocation
---
src/modules/geolocation/meson.build | 53 +++++++++++--------------------------
src/modules/meson.build | 2 +-
2 files changed, 16 insertions(+), 39 deletions(-)
diff --git a/src/modules/geolocation/meson.build
b/src/modules/geolocation/meson.build
index 21c413200..7764eec83 100644
--- a/src/modules/geolocation/meson.build
+++ b/src/modules/geolocation/meson.build
@@ -1,42 +1,19 @@
-geolocation_dist = [
- 'e-module-geolocation.edj',
- 'module.desktop',
+created_file = [
+ 'eldbus_geo_clue2_client.c',
+ 'eldbus_geo_clue2_client.h',
+ 'eldbus_geo_clue2_location.c',
+ 'eldbus_geo_clue2_location.h',
+ 'eldbus_geo_clue2_manager.c',
+ 'eldbus_geo_clue2_manager.h',
+ 'eldbus_utils.h'
]
-geolocation_src = [
+src = [files(
'e_mod_main.c'
-]
-
-geolocation_dir = join_paths(dir_module_e, 'geolocation', module_arch)
-if get_option('geolocation') == true
- config_h.set('USE_MODULE_GEOLOCATION', '1')
-
- install_data(geolocation_dist,
- install_dir: join_paths(dir_module_e, 'geolocation')
- )
-
- gen_geo = custom_target('geolocation_gen',
- input: 'org.freedesktop.GeoClue2.xml',
- command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
- output: [
- 'eldbus_geo_clue2_client.c',
- 'eldbus_geo_clue2_client.h',
- 'eldbus_geo_clue2_location.c',
- 'eldbus_geo_clue2_location.h',
- 'eldbus_geo_clue2_manager.c',
- 'eldbus_geo_clue2_manager.h',
- 'eldbus_utils.h'
- ]
- )
-
- module_files += join_paths(geolocation_dir, 'geolocation.so')
- shared_module('geolocation',
- [geolocation_src, gen_geo],
- include_directories: include_directories(module_includes),
- name_prefix: '',
- dependencies: module_deps,
- install_dir: geolocation_dir,
- install: true
- )
-endif
+)]
+src += custom_target('geolocation_gen',
+ input: 'org.freedesktop.GeoClue2.xml',
+ command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
+ output: created_file
+)
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 2d0f511d4..f22869c68 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -7,7 +7,6 @@ subdir('teamwork')
subdir('wl_desktop_shell')
subdir('wl_text_input')
subdir('wl_weekeyboard')
-subdir('geolocation')
subdir('sysinfo')
# disabled for now
@@ -39,6 +38,7 @@ mods = [
'conf_paths',
'conf_interaction',
'gadman',
+ 'geolocation',
'connman',
'bluez4',
'syscon',
--
