summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-07-26 16:35:23 +0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-07-26 18:23:46 +0200
commitf31d840ad06150ba5913a3981ccfd9062e709e62 (patch)
tree641ae77bbabf2f5ed7bedc1396dd7a00c4fe7308
parent29ef798c26f811987d2629027d0687ea351c4212 (diff)
-rw-r--r--meson.build68
-rw-r--r--src/modules/appmenu/meson.build25
-rw-r--r--src/modules/backlight/meson.build25
-rw-r--r--src/modules/battery/meson.build44
-rw-r--r--src/modules/bluez4/meson.build25
-rw-r--r--src/modules/clock/meson.build25
-rw-r--r--src/modules/conf/meson.build25
-rw-r--r--src/modules/conf_applications/meson.build20
-rw-r--r--src/modules/conf_bindings/meson.build24
-rw-r--r--src/modules/conf_dialogs/meson.build25
-rw-r--r--src/modules/conf_display/meson.build25
-rw-r--r--src/modules/conf_interaction/meson.build21
-rw-r--r--src/modules/conf_intl/meson.build24
-rw-r--r--src/modules/conf_menus/meson.build26
-rw-r--r--src/modules/conf_paths/meson.build25
-rw-r--r--src/modules/conf_performance/meson.build20
-rw-r--r--src/modules/conf_randr/meson.build25
-rw-r--r--src/modules/conf_shelves/meson.build20
-rw-r--r--src/modules/conf_theme/meson.build24
-rw-r--r--src/modules/conf_window_manipulation/meson.build20
-rw-r--r--src/modules/conf_window_remembers/meson.build20
-rw-r--r--src/modules/connman/meson.build25
-rw-r--r--src/modules/cpufreq/meson.build36
-rw-r--r--src/modules/everything/meson.build14
-rw-r--r--src/modules/fileman/meson.build25
-rw-r--r--src/modules/fileman_opinfo/meson.build25
-rw-r--r--src/modules/gadman/meson.build25
-rw-r--r--src/modules/ibar/meson.build25
-rw-r--r--src/modules/ibox/meson.build25
-rw-r--r--src/modules/luncher/meson.build16
-rw-r--r--src/modules/meson.build55
-rw-r--r--src/modules/msgbus/meson.build16
-rw-r--r--src/modules/notification/meson.build16
-rw-r--r--src/modules/packagekit/meson.build16
-rw-r--r--src/modules/pager/meson.build16
-rw-r--r--src/modules/pager_plain/meson.build16
-rw-r--r--src/modules/quickaccess/meson.build16
-rw-r--r--src/modules/shot/meson.build16
-rw-r--r--src/modules/start/meson.build16
-rw-r--r--src/modules/syscon/meson.build16
-rw-r--r--src/modules/sysinfo/meson.build36
-rw-r--r--src/modules/systray/meson.build16
-rw-r--r--src/modules/tasks/meson.build16
-rw-r--r--src/modules/teamwork/meson.build16
-rw-r--r--src/modules/temperature/meson.build16
-rw-r--r--src/modules/tiling/meson.build18
-rw-r--r--src/modules/time/meson.build16
-rw-r--r--src/modules/winlist/meson.build16
-rw-r--r--src/modules/wireless/meson.build16
-rw-r--r--src/modules/xkbswitch/meson.build16
50 files changed, 139 insertions, 1014 deletions
diff --git a/meson.build b/meson.build
index f89d314ba..2851ac0ed 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ if git.found() == true
19 if git_cmd.returncode() == 0 19 if git_cmd.returncode() == 0
20 git_version = git_cmd.stdout().strip() 20 git_version = git_cmd.stdout().strip()
21 endif 21 endif
22endif 22endif
23e_version_rev = '.'.join([meson.project_version(), git_version]) 23e_version_rev = '.'.join([meson.project_version(), git_version])
24#e_version_rev = e_version 24#e_version_rev = e_version
25 25
@@ -397,72 +397,12 @@ subdir('src/bin')
397 397
398module_files = [] 398module_files = []
399module_ldflags = '-module -avoid-version' 399module_ldflags = '-module -avoid-version'
400general_module_includes = ['../..', '../bin', '../bin/efx']
400module_includes = ['../../..', '../../bin', '../../bin/efx'] 401module_includes = ['../../..', '../../bin', '../../bin/efx']
401module_deps = [deps_e, dep_dl] 402module_deps = [deps_e, dep_dl]
402 403
403subdir('src/modules/ibar') 404
404subdir('src/modules/clock') 405subdir('src/modules')
405subdir('src/modules/pager')
406subdir('src/modules/pager_plain')
407subdir('src/modules/battery')
408subdir('src/modules/temperature')
409subdir('src/modules/notification')
410subdir('src/modules/cpufreq')
411subdir('src/modules/ibox')
412subdir('src/modules/start')
413subdir('src/modules/winlist')
414subdir('src/modules/fileman')
415subdir('src/modules/fileman_opinfo')
416subdir('src/modules/wizard')
417subdir('src/modules/conf')
418subdir('src/modules/conf_theme')
419subdir('src/modules/conf_intl')
420subdir('src/modules/msgbus')
421subdir('src/modules/conf_applications')
422subdir('src/modules/conf_display')
423subdir('src/modules/conf_shelves')
424subdir('src/modules/conf_bindings')
425subdir('src/modules/conf_window_remembers')
426subdir('src/modules/conf_window_manipulation')
427subdir('src/modules/conf_menus')
428subdir('src/modules/conf_dialogs')
429subdir('src/modules/conf_performance')
430subdir('src/modules/conf_paths')
431subdir('src/modules/conf_interaction')
432subdir('src/modules/gadman')
433subdir('src/modules/mixer')
434subdir('src/modules/connman')
435subdir('src/modules/bluez4')
436subdir('src/modules/syscon')
437subdir('src/modules/everything')
438subdir('src/modules/systray')
439subdir('src/modules/appmenu')
440subdir('src/modules/quickaccess')
441subdir('src/modules/teamwork')
442subdir('src/modules/lokker')
443subdir('src/modules/shot')
444subdir('src/modules/backlight')
445subdir('src/modules/tasks')
446subdir('src/modules/conf_randr')
447subdir('src/modules/xkbswitch')
448subdir('src/modules/tiling')
449subdir('src/modules/music-control')
450subdir('src/modules/packagekit')
451subdir('src/modules/wl_desktop_shell')
452subdir('src/modules/wl_x11')
453subdir('src/modules/wl_wl')
454subdir('src/modules/wl_buffer')
455#subdir('src/modules/wl_fb')
456subdir('src/modules/wl_drm')
457subdir('src/modules/wl_text_input')
458subdir('src/modules/wl_weekeyboard')
459subdir('src/modules/policy_mobile')
460subdir('src/modules/geolocation')
461subdir('src/modules/xwayland')
462subdir('src/modules/wireless')
463subdir('src/modules/time')
464subdir('src/modules/sysinfo')
465subdir('src/modules/luncher')
466 406
467subdir('config') 407subdir('config')
468 408
diff --git a/src/modules/appmenu/meson.build b/src/modules/appmenu/meson.build
index c2f241fe9..e6264f535 100644
--- a/src/modules/appmenu/meson.build
+++ b/src/modules/appmenu/meson.build
@@ -1,8 +1,3 @@
1appmenu_dist = [
2 'e-module-appmenu.edj',
3 'module.desktop',
4]
5
6appmenu_src = [ 1appmenu_src = [
7 'e_mod_main.c', 2 'e_mod_main.c',
8 'e_mod_appmenu_render.c', 3 'e_mod_appmenu_render.c',
@@ -10,22 +5,4 @@ appmenu_src = [
10 'e_mod_appmenu_private.h' 5 'e_mod_appmenu_private.h'
11] 6]
12 7
13appmenu_dir = join_paths(dir_module_e, 'appmenu', module_arch) 8module += [appmenu_src, 'e-module-appmenu.edj']
14if get_option('appmenu') == true
15 config_h.set('USE_MODULE_APPMENU', '1')
16
17 install_data(appmenu_dist,
18 install_dir: join_paths(dir_module_e, 'appmenu')
19 )
20
21 module_files += join_paths(appmenu_dir, 'appmenu.so')
22 shared_module('appmenu',
23 appmenu_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: appmenu_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/backlight/meson.build b/src/modules/backlight/meson.build
index 939090420..9a0f4c7aa 100644
--- a/src/modules/backlight/meson.build
+++ b/src/modules/backlight/meson.build
@@ -1,30 +1,7 @@
1backlight_dist = [
2 'e-module-backlight.edj',
3 'module.desktop',
4]
5
6backlight_src = [ 1backlight_src = [
7 'e_mod_main.c', 2 'e_mod_main.c',
8 'gadget/backlight.c', 3 'gadget/backlight.c',
9 'gadget/mod.c' 4 'gadget/mod.c'
10] 5]
11 6
12backlight_dir = join_paths(dir_module_e, 'backlight', module_arch) 7module += [backlight_src, 'e-module-backlight.edj']
13if get_option('backlight') == true
14 config_h.set('USE_MODULE_BACKLIGHT', '1')
15
16 install_data(backlight_dist,
17 install_dir: join_paths(dir_module_e, 'backlight')
18 )
19
20 module_files += join_paths(backlight_dir, 'backlight.so')
21 shared_module('backlight',
22 backlight_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: backlight_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/battery/meson.build b/src/modules/battery/meson.build
index 4d138a099..b4af5acf7 100644
--- a/src/modules/battery/meson.build
+++ b/src/modules/battery/meson.build
@@ -1,8 +1,3 @@
1battery_dist = [
2 'e-module-battery.edj',
3 'module.desktop',
4]
5
6battery_src = [ 1battery_src = [
7 'e_mod_config.c', 2 'e_mod_config.c',
8 'e_mod_main.c', 3 'e_mod_main.c',
@@ -10,36 +5,21 @@ battery_src = [
10] 5]
11 6
12if config_h.has('HAVE_EEZE') == true 7if config_h.has('HAVE_EEZE') == true
13 battery_src += 'e_mod_udev.c' 8 battery_src += 'e_mod_udev.c'
14elif host_machine.system().contains('bsd') == true 9elif host_machine.system().contains('bsd') == true
15 battery_src += 'e_mod_sysctl.c' 10 battery_src += 'e_mod_sysctl.c'
16else 11else
17 battery_src += 'e_mod_upower.c' 12 battery_src += 'e_mod_upower.c'
18endif 13endif
19 14
20battery_dir = join_paths(dir_module_e, 'battery', module_arch) 15module += [battery_src, 'e-module-battery.edj']
21if get_option('battery') == true
22 config_h.set('USE_MODULE_BATTERY', '1')
23
24 install_data(battery_dist,
25 install_dir: join_paths(dir_module_e, 'battery')
26 )
27 16
28 module_files += join_paths(battery_dir, 'battery.so') 17battery_dir = join_paths(dir_module_e, 'battery', module_arch)
29 shared_module('battery',
30 battery_src,
31 include_directories: include_directories(module_includes),
32 name_prefix: '',
33 dependencies: module_deps,
34 install_dir: battery_dir,
35 install: true
36 )
37 18
38 executable('batget', 19executable('batget',
39 'batget.c', 20 'batget.c',
40 include_directories: include_directories(module_includes), 21 include_directories: include_directories(module_includes),
41 dependencies: [dep_eina, dep_ecore, dep_ecore_con, dep_ecore_file], 22 dependencies: [dep_eina, dep_ecore, dep_ecore_con, dep_ecore_file],
42 install_dir: battery_dir, 23 install_dir: battery_dir,
43 install: true 24 install: true
44 ) 25)
45endif
diff --git a/src/modules/bluez4/meson.build b/src/modules/bluez4/meson.build
index 7c6e107ea..cac194fbc 100644
--- a/src/modules/bluez4/meson.build
+++ b/src/modules/bluez4/meson.build
@@ -1,30 +1,7 @@
1bluez4_dist = [
2 'e-module-bluez4.edj',
3 'module.desktop',
4]
5
6bluez4_src = [ 1bluez4_src = [
7 'agent.c', 2 'agent.c',
8 'ebluez4.c', 3 'ebluez4.c',
9 'e_mod_main.c' 4 'e_mod_main.c'
10] 5]
11 6
12bluez4_dir = join_paths(dir_module_e, 'bluez4', module_arch) 7module += [bluez4_src, 'e-module-bluez4.edj']
13if get_option('bluez4') == true
14 config_h.set('USE_MODULE_BLUEZ4', '1')
15
16 install_data(bluez4_dist,
17 install_dir: join_paths(dir_module_e, 'bluez4')
18 )
19
20 module_files += join_paths(bluez4_dir, 'bluez4.so')
21 shared_module('bluez4',
22 bluez4_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: bluez4_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/clock/meson.build b/src/modules/clock/meson.build
index 8fc730244..0a83b5277 100644
--- a/src/modules/clock/meson.build
+++ b/src/modules/clock/meson.build
@@ -1,29 +1,6 @@
1clock_dist = [
2 'e-module-clock.edj',
3 'module.desktop',
4]
5
6clock_src = [ 1clock_src = [
7 'e_mod_config.c', 2 'e_mod_config.c',
8 'e_mod_main.c' 3 'e_mod_main.c'
9] 4]
10 5
11clock_dir = join_paths(dir_module_e, 'clock', module_arch) 6module += [clock_src, 'e-module-clock.edj']
12if get_option('clock') == true
13 config_h.set('USE_MODULE_CLOCK', '1')
14
15 install_data(clock_dist,
16 install_dir: join_paths(dir_module_e, 'clock')
17 )
18
19 module_files += join_paths(clock_dir, 'clock.so')
20 shared_module('clock',
21 clock_src,
22 include_directories: include_directories(module_includes),
23 name_prefix: '',
24 dependencies: module_deps,
25 install_dir: clock_dir,
26 install: true
27 )
28endif
29
diff --git a/src/modules/conf/meson.build b/src/modules/conf/meson.build
index 75e02d4d9..ad3711190 100644
--- a/src/modules/conf/meson.build
+++ b/src/modules/conf/meson.build
@@ -1,30 +1,7 @@
1conf_dist = [
2 'e-module-conf.edj',
3 'module.desktop',
4]
5
6conf_src = [ 1conf_src = [
7 'e_conf.c', 2 'e_conf.c',
8 'e_mod_config.c', 3 'e_mod_config.c',
9 'e_mod_main.c' 4 'e_mod_main.c'
10] 5]
11 6
12conf_dir = join_paths(dir_module_e, 'conf', module_arch) 7module += [conf_src, 'e-module-conf.edj']
13if get_option('conf') == true
14 config_h.set('USE_MODULE_CONF', '1')
15
16 install_data(conf_dist,
17 install_dir: join_paths(dir_module_e, 'conf')
18 )
19
20 module_files += join_paths(conf_dir, 'conf.so')
21 shared_module('conf',
22 conf_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: conf_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/conf_applications/meson.build b/src/modules/conf_applications/meson.build
index 3975a9397..086d0f5af 100644
--- a/src/modules/conf_applications/meson.build
+++ b/src/modules/conf_applications/meson.build
@@ -12,22 +12,4 @@ conf_applications_src = [
12 'e_mod_main.h', 12 'e_mod_main.h',
13] 13]
14 14
15conf_applications_dir = join_paths(dir_module_e, 'conf_applications', module_arch) 15module += [conf_applications_src, 'e-module-conf_applications.edj']
16if get_option('conf-applications') == true
17 config_h.set('USE_MODULE_CONF_APPLICATIONS', '1')
18
19 install_data(conf_applications_dist,
20 install_dir: join_paths(dir_module_e, 'conf_applications')
21 )
22
23 module_files += join_paths(conf_applications_dir, 'conf_applications.so')
24 shared_module('conf_applications',
25 conf_applications_src,
26 include_directories: include_directories(module_includes),
27 name_prefix: '',
28 dependencies: module_deps,
29 install_dir: conf_applications_dir,
30 install: true
31 )
32endif
33
diff --git a/src/modules/conf_bindings/meson.build b/src/modules/conf_bindings/meson.build
index c6507f68d..3a02c4280 100644
--- a/src/modules/conf_bindings/meson.build
+++ b/src/modules/conf_bindings/meson.build
@@ -1,7 +1,3 @@
1conf_bindings_dist = [
2 'module.desktop',
3]
4
5conf_bindings_src = [ 1conf_bindings_src = [
6 'e_int_config_acpibindings.c', 2 'e_int_config_acpibindings.c',
7 'e_int_config_edgebindings.c', 3 'e_int_config_edgebindings.c',
@@ -12,22 +8,4 @@ conf_bindings_src = [
12 'e_mod_main.h', 8 'e_mod_main.h',
13] 9]
14 10
15conf_bindings_dir = join_paths(dir_module_e, 'conf_bindings', module_arch) 11module += [conf_bindings_src]
16if get_option('conf-bindings') == true
17 config_h.set('USE_MODULE_CONF_BINDINGS', '1')
18
19 install_data(conf_bindings_dist,
20 install_dir: join_paths(dir_module_e, 'conf_bindings')
21 )
22
23 module_files += join_paths(conf_bindings_dir, 'conf_bindings.so')
24 shared_module('conf_bindings',
25 conf_bindings_src,
26 include_directories: include_directories(module_includes),
27 name_prefix: '',
28 dependencies: module_deps,
29 install_dir: conf_bindings_dir,
30 install: true
31 )
32endif
33
diff --git a/src/modules/conf_dialogs/meson.build b/src/modules/conf_dialogs/meson.build
index 6ef8e8c3b..64f628dde 100644
--- a/src/modules/conf_dialogs/meson.build
+++ b/src/modules/conf_dialogs/meson.build
@@ -1,8 +1,3 @@
1conf_dialogs_dist = [
2 'e-module-conf_dialogs.edj',
3 'module.desktop',
4]
5
6conf_dialogs_src = [ 1conf_dialogs_src = [
7 'e_int_config_dialogs.c', 2 'e_int_config_dialogs.c',
8 'e_int_config_profiles.c', 3 'e_int_config_profiles.c',
@@ -10,22 +5,4 @@ conf_dialogs_src = [
10 'e_mod_main.h', 5 'e_mod_main.h',
11] 6]
12 7
13conf_dialogs_dir = join_paths(dir_module_e, 'conf_dialogs', module_arch) 8module += [conf_dialogs_src, 'e-module-conf_dialogs.edj']
14if get_option('conf-dialogs') == true
15 config_h.set('USE_MODULE_CONF_DIALOGS', '1')
16
17 install_data(conf_dialogs_dist,
18 install_dir: join_paths(dir_module_e, 'conf_dialogs')
19 )
20
21 module_files += join_paths(conf_dialogs_dir, 'conf_dialogs.so')
22 shared_module('conf_dialogs',
23 conf_dialogs_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_dialogs_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_display/meson.build b/src/modules/conf_display/meson.build
index d6d3dd47e..44cc7ef13 100644
--- a/src/modules/conf_display/meson.build
+++ b/src/modules/conf_display/meson.build
@@ -1,7 +1,3 @@
1conf_display_dist = [
2 'module.desktop',
3]
4
5conf_display_src = [ 1conf_display_src = [
6 'e_int_config_desk.c', 2 'e_int_config_desk.c',
7 'e_int_config_desklock.c', 3 'e_int_config_desklock.c',
@@ -12,23 +8,4 @@ conf_display_src = [
12 'e_mod_main.c', 8 'e_mod_main.c',
13 'e_mod_main.h', 9 'e_mod_main.h',
14] 10]
15 11module += [conf_display_src]
16conf_display_dir = join_paths(dir_module_e, 'conf_display', module_arch)
17if get_option('conf-display') == true
18 config_h.set('USE_MODULE_CONF_DISPLAY', '1')
19
20 install_data(conf_display_dist,
21 install_dir: join_paths(dir_module_e, 'conf_display')
22 )
23
24 module_files += join_paths(conf_display_dir, 'conf_display.so')
25 shared_module('conf_display',
26 conf_display_src,
27 include_directories: include_directories(module_includes),
28 name_prefix: '',
29 dependencies: module_deps,
30 install_dir: conf_display_dir,
31 install: true
32 )
33endif
34
diff --git a/src/modules/conf_interaction/meson.build b/src/modules/conf_interaction/meson.build
index f33026f35..da8fbd231 100644
--- a/src/modules/conf_interaction/meson.build
+++ b/src/modules/conf_interaction/meson.build
@@ -9,23 +9,4 @@ conf_interaction_src = [
9 'e_mod_main.c', 9 'e_mod_main.c',
10 'e_mod_main.h', 10 'e_mod_main.h',
11] 11]
12 12module +=[conf_interaction_src, 'e-module-conf_interaction.edj']
13conf_interaction_dir = join_paths(dir_module_e, 'conf_interaction', module_arch)
14if get_option('conf-interaction') == true
15 config_h.set('USE_MODULE_CONF_INTERACTION', '1')
16
17 install_data(conf_interaction_dist,
18 install_dir: join_paths(dir_module_e, 'conf_interaction')
19 )
20
21 module_files += join_paths(conf_interaction_dir, 'conf_interaction.so')
22 shared_module('conf_interaction',
23 conf_interaction_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_interaction_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_intl/meson.build b/src/modules/conf_intl/meson.build
index bffa6cbc9..93e26d76b 100644
--- a/src/modules/conf_intl/meson.build
+++ b/src/modules/conf_intl/meson.build
@@ -1,7 +1,3 @@
1conf_intl_dist = [
2 'module.desktop',
3]
4
5conf_intl_src = [ 1conf_intl_src = [
6 'e_int_config_imc.c', 2 'e_int_config_imc.c',
7 'e_int_config_imc_import.c', 3 'e_int_config_imc_import.c',
@@ -10,22 +6,4 @@ conf_intl_src = [
10 'e_mod_main.h', 6 'e_mod_main.h',
11] 7]
12 8
13conf_intl_dir = join_paths(dir_module_e, 'conf_intl', module_arch) 9module += [conf_intl_src]
14if get_option('conf-intl') == true
15 config_h.set('USE_MODULE_CONF_INTL', '1')
16
17 install_data(conf_intl_dist,
18 install_dir: join_paths(dir_module_e, 'conf_intl')
19 )
20
21 module_files += join_paths(conf_intl_dir, 'conf_intl.so')
22 shared_module('conf_intl',
23 conf_intl_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_intl_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_menus/meson.build b/src/modules/conf_menus/meson.build
index d699b8a30..aabf3576f 100644
--- a/src/modules/conf_menus/meson.build
+++ b/src/modules/conf_menus/meson.build
@@ -1,30 +1,6 @@
1conf_menus_dist = [
2 'e-module-conf_menus.edj',
3 'module.desktop',
4]
5
6conf_menus_src = [ 1conf_menus_src = [
7 'e_int_config_menus.c', 2 'e_int_config_menus.c',
8 'e_mod_main.c', 3 'e_mod_main.c',
9 'e_mod_main.h', 4 'e_mod_main.h',
10] 5]
11 6module += [conf_menus_src, 'e-module-conf_menus.edj']
12conf_menus_dir = join_paths(dir_module_e, 'conf_menus', module_arch)
13if get_option('conf-menus') == true
14 config_h.set('USE_MODULE_CONF_MENUS', '1')
15
16 install_data(conf_menus_dist,
17 install_dir: join_paths(dir_module_e, 'conf_menus')
18 )
19
20 module_files += join_paths(conf_menus_dir, 'conf_menus.so')
21 shared_module('conf_menus',
22 conf_menus_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: conf_menus_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/conf_paths/meson.build b/src/modules/conf_paths/meson.build
index 0e62e776b..7e95c8272 100644
--- a/src/modules/conf_paths/meson.build
+++ b/src/modules/conf_paths/meson.build
@@ -1,8 +1,3 @@
1conf_paths_dist = [
2 'e-module-conf_paths.edj',
3 'module.desktop',
4]
5
6conf_paths_src = [ 1conf_paths_src = [
7 'e_int_config_env.c', 2 'e_int_config_env.c',
8 'e_int_config_paths.c', 3 'e_int_config_paths.c',
@@ -10,22 +5,4 @@ conf_paths_src = [
10 'e_mod_main.h', 5 'e_mod_main.h',
11] 6]
12 7
13conf_paths_dir = join_paths(dir_module_e, 'conf_paths', module_arch) 8module += [conf_paths_src, 'e-module-conf_paths.edj']
14if get_option('conf-paths') == true
15 config_h.set('USE_MODULE_CONF_PATHS', '1')
16
17 install_data(conf_paths_dist,
18 install_dir: join_paths(dir_module_e, 'conf_paths')
19 )
20
21 module_files += join_paths(conf_paths_dir, 'conf_paths.so')
22 shared_module('conf_paths',
23 conf_paths_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_paths_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_performance/meson.build b/src/modules/conf_performance/meson.build
index 85c122c3f..8a6cc7413 100644
--- a/src/modules/conf_performance/meson.build
+++ b/src/modules/conf_performance/meson.build
@@ -10,22 +10,4 @@ conf_performance_src = [
10 'e_mod_main.h', 10 'e_mod_main.h',
11] 11]
12 12
13conf_performance_dir = join_paths(dir_module_e, 'conf_performance', module_arch) 13module += [conf_performance_src, 'e-module-conf_performance.edj']
14if get_option('conf-performance') == true
15 config_h.set('USE_MODULE_CONF_PERFORMANCE', '1')
16
17 install_data(conf_performance_dist,
18 install_dir: join_paths(dir_module_e, 'conf_performance')
19 )
20
21 module_files += join_paths(conf_performance_dir, 'conf_performance.so')
22 shared_module('conf_performance',
23 conf_performance_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_performance_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_randr/meson.build b/src/modules/conf_randr/meson.build
index 2ce882dba..cb9cd70ff 100644
--- a/src/modules/conf_randr/meson.build
+++ b/src/modules/conf_randr/meson.build
@@ -1,8 +1,3 @@
1conf_randr_dist = [
2 'e-module-conf_randr.edj',
3 'module.desktop',
4]
5
6conf_randr_src = [ 1conf_randr_src = [
7 'e_int_config_randr2.c', 2 'e_int_config_randr2.c',
8 'e_mod_main.c', 3 'e_mod_main.c',
@@ -10,22 +5,4 @@ conf_randr_src = [
10 'e_mod_main.h', 5 'e_mod_main.h',
11] 6]
12 7
13conf_randr_dir = join_paths(dir_module_e, 'conf_randr', module_arch) 8module += [conf_randr_src, 'e-module-conf_randr.edj']
14if get_option('conf-randr') == true
15 config_h.set('USE_MODULE_CONF_RANDR', '1')
16
17 install_data(conf_randr_dist,
18 install_dir: join_paths(dir_module_e, 'conf_randr')
19 )
20
21 module_files += join_paths(conf_randr_dir, 'conf_randr.so')
22 shared_module('conf_randr',
23 conf_randr_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_randr_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_shelves/meson.build b/src/modules/conf_shelves/meson.build
index 387aeec86..145535def 100644
--- a/src/modules/conf_shelves/meson.build
+++ b/src/modules/conf_shelves/meson.build
@@ -10,22 +10,4 @@ conf_shelves_src = [
10 'e_mod_main.h', 10 'e_mod_main.h',
11] 11]
12 12
13conf_shelves_dir = join_paths(dir_module_e, 'conf_shelves', module_arch) 13module += [conf_shelves_src, 'e-module-conf_shelves.edj']
14if get_option('conf-shelves') == true
15 config_h.set('USE_MODULE_CONF_SHELVES', '1')
16
17 install_data(conf_shelves_dist,
18 install_dir: join_paths(dir_module_e, 'conf_shelves')
19 )
20
21 module_files += join_paths(conf_shelves_dir, 'conf_shelves.so')
22 shared_module('conf_shelves',
23 conf_shelves_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: conf_shelves_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/conf_theme/meson.build b/src/modules/conf_theme/meson.build
index 28ff663c4..07c30b858 100644
--- a/src/modules/conf_theme/meson.build
+++ b/src/modules/conf_theme/meson.build
@@ -1,7 +1,3 @@
1conf_theme_dist = [
2 'module.desktop',
3]
4
5conf_theme_src = [ 1conf_theme_src = [
6 'e_int_config_borders.c', 2 'e_int_config_borders.c',
7 'e_int_config_color_classes.c', 3 'e_int_config_color_classes.c',
@@ -16,22 +12,4 @@ conf_theme_src = [
16 'e_mod_main.h', 12 'e_mod_main.h',
17] 13]
18 14
19conf_theme_dir = join_paths(dir_module_e, 'conf_theme', module_arch) 15module += [conf_theme_src]
20if get_option('conf-theme') == true
21 config_h.set('USE_MODULE_CONF_THEME', '1')
22
23 install_data(conf_theme_dist,
24 install_dir: join_paths(dir_module_e, 'conf_theme')
25 )
26
27 module_files += join_paths(conf_theme_dir, 'conf_theme.so')
28 shared_module('conf_theme',
29 conf_theme_src,
30 include_directories: include_directories(module_includes),
31 name_prefix: '',
32 dependencies: module_deps,
33 install_dir: conf_theme_dir,
34 install: true
35 )
36endif
37
diff --git a/src/modules/conf_window_manipulation/meson.build b/src/modules/conf_window_manipulation/meson.build
index e404b3c83..c0e5f6b6c 100644
--- a/src/modules/conf_window_manipulation/meson.build
+++ b/src/modules/conf_window_manipulation/meson.build
@@ -13,22 +13,4 @@ conf_window_manipulation_src = [
13 'e_mod_main.h', 13 'e_mod_main.h',
14] 14]
15 15
16conf_window_manipulation_dir = join_paths(dir_module_e, 'conf_window_manipulation', module_arch) 16module += [conf_window_manipulation_src, 'e-module-conf_winmanip.edj']
17if get_option('conf-window-manipulation') == true
18 config_h.set('USE_MODULE_CONF_WINDOW_MANIPULATION', '1')
19
20 install_data(conf_window_manipulation_dist,
21 install_dir: join_paths(dir_module_e, 'conf_window_manipulation')
22 )
23
24 module_files += join_paths(conf_window_manipulation_dir, 'conf_window_manipulation.so')
25 shared_module('conf_window_manipulation',
26 conf_window_manipulation_src,
27 include_directories: include_directories(module_includes),
28 name_prefix: '',
29 dependencies: module_deps,
30 install_dir: conf_window_manipulation_dir,
31 install: true
32 )
33endif
34
diff --git a/src/modules/conf_window_remembers/meson.build b/src/modules/conf_window_remembers/meson.build
index ed4f1bc8d..ebbb5737f 100644
--- a/src/modules/conf_window_remembers/meson.build
+++ b/src/modules/conf_window_remembers/meson.build
@@ -9,22 +9,4 @@ conf_window_remembers_src = [
9 'e_mod_main.h', 9 'e_mod_main.h',
10] 10]
11 11
12conf_window_remembers_dir = join_paths(dir_module_e, 'conf_window_remembers', module_arch) 12module += [conf_window_remembers_src, 'e-module-conf_window_remembers.edj']
13if get_option('conf-window-remembers') == true
14 config_h.set('USE_MODULE_CONF_WINDOW_REMEMBERS', '1')
15
16 install_data(conf_window_remembers_dist,
17 install_dir: join_paths(dir_module_e, 'conf_window_remembers')
18 )
19
20 module_files += join_paths(conf_window_remembers_dir, 'conf_window_remembers.so')
21 shared_module('conf_window_remembers',
22 conf_window_remembers_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: conf_window_remembers_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/connman/meson.build b/src/modules/connman/meson.build
index 7d1327a88..681fcca02 100644
--- a/src/modules/connman/meson.build
+++ b/src/modules/connman/meson.build
@@ -1,8 +1,3 @@
1connman_dist = [
2 'e-module-connman.edj',
3 'module.desktop',
4]
5
6connman_src = [ 1connman_src = [
7 'agent.c', 2 'agent.c',
8 'e_connman.c', 3 'e_connman.c',
@@ -12,22 +7,4 @@ connman_src = [
12 'e_mod_main.h', 7 'e_mod_main.h',
13] 8]
14 9
15connman_dir = join_paths(dir_module_e, 'connman', module_arch) 10module += [connman_src, 'e-module-connman.edj']
16if get_option('connman') == true
17 config_h.set('USE_MODULE_CONNMAN', '1')
18
19 install_data(connman_dist,
20 install_dir: join_paths(dir_module_e, 'connman')
21 )
22
23 module_files += join_paths(connman_dir, 'connman.so')
24 shared_module('connman',
25 connman_src,
26 include_directories: include_directories(module_includes),
27 name_prefix: '',
28 dependencies: module_deps,
29 install_dir: connman_dir,
30 install: true
31 )
32endif
33
diff --git a/src/modules/cpufreq/meson.build b/src/modules/cpufreq/meson.build
index e69f255b0..23ddb28d6 100644
--- a/src/modules/cpufreq/meson.build
+++ b/src/modules/cpufreq/meson.build
@@ -10,31 +10,15 @@ cpufreq_src = [
10 'e_mod_main.h', 10 'e_mod_main.h',
11] 11]
12 12
13cpufreq_dir = join_paths(dir_module_e, 'cpufreq', module_arch) 13module += [cpufreq_src, 'e-module-cpufreq.edj']
14if get_option('cpufreq') == true
15 config_h.set('USE_MODULE_CPUFREQ', '1')
16
17 install_data(cpufreq_dist,
18 install_dir: join_paths(dir_module_e, 'cpufreq')
19 )
20 14
21 module_files += join_paths(cpufreq_dir, 'cpufreq.so') 15cpufreq_dir = join_paths(dir_module_e, 'cpufreq', module_arch)
22 shared_module('cpufreq',
23 cpufreq_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: cpufreq_dir,
28 install: true
29 )
30
31 executable('freqset',
32 'freqset.c',
33 c_args: suid_cflags,
34 link_args: suid_ldflags,
35 install_dir: cpufreq_dir,
36 install: true
37 )
38 suid_exes += join_paths(cpufreq_dir, 'freqset')
39endif
40 16
17executable('freqset',
18 'freqset.c',
19 c_args: suid_cflags,
20 link_args: suid_ldflags,
21 install_dir: cpufreq_dir,
22 install: true
23)
24suid_exes += join_paths(cpufreq_dir, 'freqset')
diff --git a/src/modules/everything/meson.build b/src/modules/everything/meson.build
index 15f8619c2..5c543264f 100644
--- a/src/modules/everything/meson.build
+++ b/src/modules/everything/meson.build
@@ -1,7 +1,6 @@
1everything_dist = [ 1everything_dist = [
2 'e-module-everything.edj', 2 'e-module-everything.edj',
3 'e-module-everything-start.edj', 3 'e-module-everything-start.edj',
4 'module.desktop',
5] 4]
6 5
7everything_src = [ 6everything_src = [
@@ -32,24 +31,15 @@ everything_src = [
32 'md5.h', 31 'md5.h',
33] 32]
34 33
34module += [everything_src]
35
35everything_dir = join_paths(dir_module_e, 'everything', module_arch) 36everything_dir = join_paths(dir_module_e, 'everything', module_arch)
36if get_option('everything') == true 37if get_option('everything') == true
37 config_h.set('USE_MODULE_EVERYTHING', '1')
38 38
39 install_data(everything_dist, 39 install_data(everything_dist,
40 install_dir: join_paths(dir_module_e, 'everything') 40 install_dir: join_paths(dir_module_e, 'everything')
41 ) 41 )
42 42
43 module_files += join_paths(everything_dir, 'everything.so')
44 shared_module('everything',
45 everything_src,
46 include_directories: include_directories(module_includes),
47 name_prefix: '',
48 dependencies: module_deps,
49 install_dir: everything_dir,
50 install: true
51 )
52
53 install_headers(['evry_api.h', 'evry_types.h'], 43 install_headers(['evry_api.h', 'evry_types.h'],
54 subdir: 'enlightenment' 44 subdir: 'enlightenment'
55 ) 45 )
diff --git a/src/modules/fileman/meson.build b/src/modules/fileman/meson.build
index 629d9527f..dc4cceb0c 100644
--- a/src/modules/fileman/meson.build
+++ b/src/modules/fileman/meson.build
@@ -1,8 +1,3 @@
1fileman_dist = [
2 'e-module-fileman.edj',
3 'module.desktop',
4]
5
6fileman_src = [ 1fileman_src = [
7 'e_fwin.c', 2 'e_fwin.c',
8 'e_fwin_nav.c', 3 'e_fwin_nav.c',
@@ -15,22 +10,4 @@ fileman_src = [
15 'e_mod_main.h', 10 'e_mod_main.h',
16] 11]
17 12
18fileman_dir = join_paths(dir_module_e, 'fileman', module_arch) 13module += [fileman_src, 'e-module-fileman.edj']
19if get_option('fileman') == true
20 config_h.set('USE_MODULE_FILEMAN', '1')
21
22 install_data(fileman_dist,
23 install_dir: join_paths(dir_module_e, 'fileman')
24 )
25
26 module_files += join_paths(fileman_dir, 'fileman.so')
27 shared_module('fileman',
28 fileman_src,
29 include_directories: include_directories(module_includes),
30 name_prefix: '',
31 dependencies: module_deps,
32 install_dir: fileman_dir,
33 install: true
34 )
35endif
36
diff --git a/src/modules/fileman_opinfo/meson.build b/src/modules/fileman_opinfo/meson.build
index b726b4f14..ec61334bd 100644
--- a/src/modules/fileman_opinfo/meson.build
+++ b/src/modules/fileman_opinfo/meson.build
@@ -1,28 +1,5 @@
1fileman_opinfo_dist = [
2 'e-module-fileman_opinfo.edj',
3 'module.desktop',
4]
5
6fileman_opinfo_src = [ 1fileman_opinfo_src = [
7 'e_mod_main.c', 2 'e_mod_main.c',
8] 3]
9 4
10fileman_opinfo_dir = join_paths(dir_module_e, 'fileman_opinfo', module_arch) 5module += [fileman_opinfo_src, 'e-module-fileman_opinfo.edj']
11if get_option('fileman-opinfo') == true
12 config_h.set('USE_MODULE_FILEMAN_OPINFO', '1')
13
14 install_data(fileman_opinfo_dist,
15 install_dir: join_paths(dir_module_e, 'fileman_opinfo')
16 )
17
18 module_files += join_paths(fileman_opinfo_dir, 'fileman_opinfo.so')
19 shared_module('fileman_opinfo',
20 fileman_opinfo_src,
21 include_directories: include_directories(module_includes),
22 name_prefix: '',
23 dependencies: module_deps,
24 install_dir: fileman_opinfo_dir,
25 install: true
26 )
27endif
28
diff --git a/src/modules/gadman/meson.build b/src/modules/gadman/meson.build
index d6e4d61da..9bc77a72f 100644
--- a/src/modules/gadman/meson.build
+++ b/src/modules/gadman/meson.build
@@ -1,8 +1,3 @@
1gadman_dist = [
2 'e-module-gadman.edj',
3 'module.desktop',
4]
5
6gadman_src = [ 1gadman_src = [
7 'e_mod_config.c', 2 'e_mod_config.c',
8 'e_mod_gadman.c', 3 'e_mod_gadman.c',
@@ -10,22 +5,4 @@ gadman_src = [
10 'e_mod_gadman.h', 5 'e_mod_gadman.h',
11] 6]
12 7
13gadman_dir = join_paths(dir_module_e, 'gadman', module_arch) 8module += [gadman_src, 'e-module-gadman.edj']
14if get_option('gadman') == true
15 config_h.set('USE_MODULE_GADMAN', '1')
16
17 install_data(gadman_dist,
18 install_dir: join_paths(dir_module_e, 'gadman')
19 )
20
21 module_files += join_paths(gadman_dir, 'gadman.so')
22 shared_module('gadman',
23 gadman_src,
24 include_directories: include_directories(module_includes),
25 name_prefix: '',
26 dependencies: module_deps,
27 install_dir: gadman_dir,
28 install: true
29 )
30endif
31
diff --git a/src/modules/ibar/meson.build b/src/modules/ibar/meson.build
index f5bffbffe..cde7deb4f 100644
--- a/src/modules/ibar/meson.build
+++ b/src/modules/ibar/meson.build
@@ -1,30 +1,7 @@
1ibar_dist = [
2 'e-module-ibar.edj',
3 'module.desktop',
4]
5
6ibar_src = [ 1ibar_src = [
7 'e_mod_config.c', 2 'e_mod_config.c',
8 'e_mod_main.c', 3 'e_mod_main.c',
9 'e_mod_main.h', 4 'e_mod_main.h',
10] 5]
11 6
12ibar_dir = join_paths(dir_module_e, 'ibar', module_arch) 7module += [ibar_src, 'e-module-ibar.edj']
13if get_option('ibar') == true
14 config_h.set('USE_MODULE_IBAR', '1')
15
16 install_data(ibar_dist,
17 install_dir: join_paths(dir_module_e, 'ibar')
18 )
19
20 module_files += join_paths(ibar_dir, 'ibar.so')
21 shared_module('ibar',
22 ibar_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: ibar_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/ibox/meson.build b/src/modules/ibox/meson.build
index 0a9c40468..8e443458e 100644
--- a/src/modules/ibox/meson.build
+++ b/src/modules/ibox/meson.build
@@ -1,30 +1,7 @@
1ibox_dist = [
2 'e-module-ibox.edj',
3 'module.desktop',
4]
5
6ibox_src = [ 1ibox_src = [
7 'e_mod_config.c', 2 'e_mod_config.c',
8 'e_mod_main.c', 3 'e_mod_main.c',
9 'e_mod_main.h', 4 'e_mod_main.h',
10] 5]
11 6
12ibox_dir = join_paths(dir_module_e, 'ibox', module_arch) 7module += [ibox_src, 'e-module-ibox.edj']
13if get_option('ibox') == true
14 config_h.set('USE_MODULE_IBOX', '1')
15
16 install_data(ibox_dist,
17 install_dir: join_paths(dir_module_e, 'ibox')
18 )
19
20 module_files += join_paths(ibox_dir, 'ibox.so')
21 shared_module('ibox',
22 ibox_src,
23 include_directories: include_directories(module_includes),
24 name_prefix: '',
25 dependencies: module_deps,
26 install_dir: ibox_dir,
27 install: true
28 )
29endif
30
diff --git a/src/modules/luncher/meson.build b/src/modules/luncher/meson.build
index 62c89bc72..93bead156 100644
--- a/src/modules/luncher/meson.build
+++ b/src/modules/luncher/meson.build
@@ -6,18 +6,4 @@ luncher_src = [
6 'luncher.h', 6 'luncher.h',
7] 7]
8 8
9luncher_dir = join_paths(dir_module_e, 'luncher', module_arch) 9module += [luncher_src, 'e-module-luncher.edj']
10if get_option('luncher') == true
11 config_h.set('USE_MODULE_LUNCHER', '1')
12
13 module_files += join_paths(luncher_dir, 'luncher.so')
14 shared_module('luncher',
15 luncher_src,
16 include_directories: include_directories(module_includes),
17 name_prefix: '',
18 dependencies: module_deps,
19 install_dir: luncher_dir,
20 install: true
21 )
22endif
23
diff --git a/src/modules/meson.build b/src/modules/meson.build
new file mode 100644
index 000000000..00a3693b4
--- /dev/null
+++ b/src/modules/meson.build
@@ -0,0 +1,55 @@
1easy_modules =['appmenu','backlight','battery','bluez4','clock','conf','conf_applications','conf_bindings','conf_dialogs','conf_display','conf_interaction','conf_intl','conf_menus','conf_paths','conf_performance','conf_randr','conf_shelves','conf_theme','conf_window_manipulation','conf_window_remembers','connman','cpufreq','everything','fileman','fileman_opinfo','gadman','ibar','ibox','luncher','msgbus','notification','packagekit','pager','pager_plain','quickaccess','shot','start','syscon','sysinfo','systray','tasks','teamwork','temperature','tiling','time','winlist','wireless','xkbswitch']
2custom_modules = ['geolocation','lokker','mixer','music-control','policy_mobile','wizard','wl_buffer','wl_desktop_shell','wl_drm','wl_text_input','wl_weekeyboard','wl_wl','wl_x11','xwayland']
3
4foreach module_name : custom_modules
5 message('Configure module ' + module_name)
6 subdir(module_name)
7endforeach
8
9foreach module_name : easy_modules
10 module_option_name = '-'.join(module_name.split('_'))
11 if get_option(module_option_name) == true
12 module = []
13 config_h.set(''.join(['USE_MODULE_', module_name.to_upper()]), '1')
14 message('Configure module ' + module_name)
15 subdir(module_name)
16
17 module_source_raw = module.get(0, '')
18 module_theme = module.get(1, '')
19 module_source = []
20
21 #convert the module sources to relative paths
22 foreach s : module_source_raw
23 module_source += join_paths([module_name, s])
24 endforeach
25
26 #generate the install dirs
27 module_object_install_dir = join_paths(dir_module_e, module_name, module_arch)
28 module_install_dir = join_paths(dir_module_e, module_name)
29
30 #add the module files
31 module_files += join_paths(module_object_install_dir, ''.join([module_name, '.so']))
32
33 #set the module.so to be compiled
34 shared_module(module_name,
35 module_source,
36 include_directories: include_directories(general_module_includes),
37 name_prefix: '',
38 dependencies: module_deps,
39 install_dir: module_object_install_dir,
40 install: true
41 )
42
43 #install theme if its there
44 if module_theme != ''
45 install_data(join_paths([module_name, module_theme]),
46 install_dir: module_install_dir,
47 install : true)
48 endif
49
50 #install module.desktop
51 install_data(join_paths([module_name, 'module.desktop']),
52 install_dir: module_install_dir,
53 install : true)
54 endif
55endforeach
diff --git a/src/modules/msgbus/meson.build b/src/modules/msgbus/meson.build
index a2c52ed81..76d76cae1 100644
--- a/src/modules/msgbus/meson.build
+++ b/src/modules/msgbus/meson.build
@@ -9,18 +9,4 @@ msgbus_src = [
9 'e_mod_main.h', 9 'e_mod_main.h',
10] 10]
11 11
12msgbus_dir = join_paths(dir_module_e, 'msgbus', module_arch) 12module += [msgbus_src, 'e-module-msgbus.edj']
13if get_option('msgbus') == true
14 config_h.set('USE_MODULE_MSGBUS', '1')
15
16 module_files += join_paths(msgbus_dir, 'msgbus.so')
17 shared_module('msgbus',
18 msgbus_src,
19 include_directories: include_directories(module_includes),
20 name_prefix: '',
21 dependencies: module_deps,
22 install_dir: msgbus_dir,
23 install: true
24 )
25endif
26
diff --git a/src/modules/notification/meson.build b/src/modules/notification/meson.build
index 75f3ee37a..d600db7f8 100644
--- a/src/modules/notification/meson.build
+++ b/src/modules/notification/meson.build
@@ -5,18 +5,4 @@ notification_src = [
5 'e_mod_main.h', 5 'e_mod_main.h',
6] 6]
7 7
8notification_dir = join_paths(dir_module_e, 'notification', module_arch) 8module += [notification_src, 'e-module-notification.edj']
9if get_option('notification') == true
10 config_h.set('USE_MODULE_NOTIFICATION', '1')
11
12 module_files += join_paths(notification_dir, 'notification.so')
13 shared_module('notification',
14 notification_src,
15 include_directories: include_directories(module_includes),
16 name_prefix: '',
17 dependencies: module_deps,
18 install_dir: notification_dir,
19 install: true
20 )
21endif
22
diff --git a/src/modules/packagekit/meson.build b/src/modules/packagekit/meson.build
index 2fdb95988..5969d4e63 100644
--- a/src/modules/packagekit/meson.build
+++ b/src/modules/packagekit/meson.build
@@ -7,18 +7,4 @@ packagekit_src = [
7 'e_mod_packagekit.h', 7 'e_mod_packagekit.h',
8] 8]
9 9
10packagekit_dir = join_paths(dir_module_e, 'packagekit', module_arch) 10module += [packagekit_src, 'e-module-packagekit.edj']
11if get_option('packagekit') == true
12 config_h.set('USE_MODULE_PACKAGEKIT', '1')
13
14 module_files += join_paths(packagekit_dir, 'packagekit.so')
15 shared_module('packagekit',
16 packagekit_src,
17 include_directories: include_directories(module_includes),
18 name_prefix: '',
19 dependencies: module_deps,
20 install_dir: packagekit_dir,
21 install: true
22 )
23endif
24
diff --git a/src/modules/pager/meson.build b/src/modules/pager/meson.build
index 93a5921de..11b241bfe 100644
--- a/src/modules/pager/meson.build
+++ b/src/modules/pager/meson.build
@@ -8,18 +8,4 @@ pager_src = [
8 'gadget/config.c' 8 'gadget/config.c'
9] 9]
10 10
11pager_dir = join_paths(dir_module_e, 'pager', module_arch) 11module += [pager_src, 'e-module-pager.edj']
12if get_option('pager') == true
13 config_h.set('USE_MODULE_PAGER', '1')
14
15 module_files += join_paths(pager_dir, 'pager.so')
16 shared_module('pager',
17 pager_src,
18 include_directories: include_directories(module_includes),
19 name_prefix: '',
20 dependencies: module_deps,
21 install_dir: pager_dir,
22 install: true
23 )
24endif
25
diff --git a/src/modules/pager_plain/meson.build b/src/modules/pager_plain/meson.build
index 0475791b1..60c8cf414 100644
--- a/src/modules/pager_plain/meson.build
+++ b/src/modules/pager_plain/meson.build
@@ -4,18 +4,4 @@ pager_plain_src = [
4 'e_mod_main.h', 4 'e_mod_main.h',
5] 5]
6 6
7pager_plain_dir = join_paths(dir_module_e, 'pager_plain', module_arch) 7module += [pager_plain_src, 'e-module-pager-plain.edj']
8if get_option('pager-plain') == true
9 config_h.set('USE_MODULE_PAGER_PLAIN', '1')
10
11 module_files += join_paths(pager_plain_dir, 'pager_plain.so')
12 shared_module('pager_plain',
13 pager_plain_src,
14 include_directories: include_directories(module_includes),
15 name_prefix: '',
16 dependencies: module_deps,
17 install_dir: pager_plain_dir,
18 install: true
19 )
20endif
21
diff --git a/src/modules/quickaccess/meson.build b/src/modules/quickaccess/meson.build
index fcda28f4b..e52cba799 100644
--- a/src/modules/quickaccess/meson.build
+++ b/src/modules/quickaccess/meson.build
@@ -7,18 +7,4 @@ quickaccess_src = [
7 'e_mod_main.h', 7 'e_mod_main.h',
8] 8]
9 9
10quickaccess_dir = join_paths(dir_module_e, 'quickaccess', module_arch) 10module += [quickaccess_src, 'e-module-quickaccess.edj']
11if get_option('quickaccess') == true
12 config_h.set('USE_MODULE_QUICKACCESS', '1')
13
14 module_files += join_paths(quickaccess_dir, 'quickaccess.so')
15 shared_module('quickaccess',
16 quickaccess_src,
17 include_directories: include_directories(module_includes),
18 name_prefix: '',
19 dependencies: module_deps,
20 install_dir: quickaccess_dir,
21 install: true
22 )
23endif
24
diff --git a/src/modules/shot/meson.build b/src/modules/shot/meson.build
index ba2b0d165..9c43af191 100644
--- a/src/modules/shot/meson.build
+++ b/src/modules/shot/meson.build
@@ -2,18 +2,4 @@ shot_src = [
2 'e_mod_main.c', 2 'e_mod_main.c',
3] 3]
4 4
5shot_dir = join_paths(dir_module_e, 'shot', module_arch) 5module += [shot_src, 'e-module-shot.edj']
6if get_option('shot') == true
7 config_h.set('USE_MODULE_SHOT', '1')
8
9 module_files += join_paths(shot_dir, 'shot.so')
10 shared_module('shot',
11 shot_src,
12 include_directories: include_directories(module_includes),
13 name_prefix: '',
14 dependencies: module_deps,
15 install_dir: shot_dir,
16 install: true
17 )
18endif
19
diff --git a/src/modules/start/meson.build b/src/modules/start/meson.build
index 57eab69f8..4412c9d1a 100644
--- a/src/modules/start/meson.build
+++ b/src/modules/start/meson.build
@@ -3,18 +3,4 @@ start_src = [
3 'start.c', 3 'start.c',
4] 4]
5 5
6start_dir = join_paths(dir_module_e, 'start', module_arch) 6module += [start_src, 'e-module-start.edj']
7if get_option('start') == true
8 config_h.set('USE_MODULE_START', '1')
9
10 module_files += join_paths(start_dir, 'start.so')
11 shared_module('start',
12 start_src,
13 include_directories: include_directories(module_includes),
14 name_prefix: '',
15 dependencies: module_deps,
16 install_dir: start_dir,
17 install: true
18 )
19endif
20
diff --git a/src/modules/syscon/meson.build b/src/modules/syscon/meson.build
index b21ed37ec..a4f00ab41 100644
--- a/src/modules/syscon/meson.build
+++ b/src/modules/syscon/meson.build
@@ -6,18 +6,4 @@ syscon_src = [
6 'e_mod_main.h', 6 'e_mod_main.h',
7] 7]
8 8
9syscon_dir = join_paths(dir_module_e, 'syscon', module_arch) 9module += [syscon_src, 'e-module-syscon.edj']
10if get_option('syscon') == true
11 config_h.set('USE_MODULE_SYSCON', '1')
12
13 module_files += join_paths(syscon_dir, 'syscon.so')
14 shared_module('syscon',
15 syscon_src,
16 include_directories: include_directories(module_includes),
17 name_prefix: '',
18 dependencies: module_deps,
19 install_dir: syscon_dir,
20 install: true
21 )
22endif
23
diff --git a/src/modules/sysinfo/meson.build b/src/modules/sysinfo/meson.build
index 0a349f807..c5f823581 100644
--- a/src/modules/sysinfo/meson.build
+++ b/src/modules/sysinfo/meson.build
@@ -44,29 +44,17 @@ else
44 ] 44 ]
45endif 45endif
46 46
47sysinfo_dir = join_paths(dir_module_e, 'sysinfo', module_arch) 47module += [sysinfo_src, 'e-module-sysinfo.edj']
48if get_option('sysinfo') == true
49 config_h.set('USE_MODULE_SYSINFO', '1')
50
51 module_files += join_paths(sysinfo_dir, 'sysinfo.so')
52 shared_module('sysinfo',
53 sysinfo_src,
54 include_directories: include_directories(module_includes),
55 name_prefix: '',
56 dependencies: module_deps,
57 install_dir: sysinfo_dir,
58 install: true
59 )
60 48
61 executable('cpuclock_sysfs', 49sysinfo_dir = join_paths(dir_module_e, 'sysinfo', module_arch)
62 'cpuclock/cpuclock_sysfs.c',
63 include_directories: include_directories(module_includes),
64 dependencies: dep_crypt,
65 c_args: suid_cflags,
66 link_args: suid_ldflags,
67 install_dir: join_paths(dir_module_e, 'sysinfo'),
68 install: true
69 )
70 suid_exes == join_paths(sysinfo_dir, 'cpuclock_sysfs')
71endif
72 50
51executable('cpuclock_sysfs',
52 'cpuclock/cpuclock_sysfs.c',
53 include_directories: include_directories(module_includes),
54 dependencies: dep_crypt,
55 c_args: suid_cflags,
56 link_args: suid_ldflags,
57 install_dir: join_paths(dir_module_e, 'sysinfo'),
58 install: true
59)
60suid_exes == join_paths(sysinfo_dir, 'cpuclock_sysfs')
diff --git a/src/modules/systray/meson.build b/src/modules/systray/meson.build
index 224598108..9ace1275e 100644
--- a/src/modules/systray/meson.build
+++ b/src/modules/systray/meson.build
@@ -7,18 +7,4 @@ systray_src = [
7 'e_mod_notifier_host_private.h', 7 'e_mod_notifier_host_private.h',
8] 8]
9 9
10systray_dir = join_paths(dir_module_e, 'systray', module_arch) 10module += [systray_src, 'e-module-systray.edj']
11if get_option('systray') == true
12 config_h.set('USE_MODULE_SYSTRAY', '1')
13
14 module_files += join_paths(systray_dir, 'systray.so')
15 shared_module('systray',
16 systray_src,
17 include_directories: include_directories(module_includes),
18 name_prefix: '',
19 dependencies: module_deps,
20 install_dir: systray_dir,
21 install: true
22 )
23endif
24
diff --git a/src/modules/tasks/meson.build b/src/modules/tasks/meson.build
index 81fd90074..0021435d8 100644
--- a/src/modules/tasks/meson.build
+++ b/src/modules/tasks/meson.build
@@ -4,18 +4,4 @@ tasks_src = [
4 'e_mod_main.h', 4 'e_mod_main.h',
5] 5]
6 6
7tasks_dir = join_paths(dir_module_e, 'tasks', module_arch) 7module += [tasks_src, 'e-module-tasks.edj']
8if get_option('tasks') == true
9 config_h.set('USE_MODULE_TASKS', '1')
10
11 module_files += join_paths(tasks_dir, 'tasks.so')
12 shared_module('tasks',
13 tasks_src,
14 include_directories: include_directories(module_includes),
15 name_prefix: '',
16 dependencies: module_deps,
17 install_dir: tasks_dir,
18 install: true
19 )
20endif
21
diff --git a/src/modules/teamwork/meson.build b/src/modules/teamwork/meson.build
index d031447fc..514ef1b7f 100644
--- a/src/modules/teamwork/meson.build
+++ b/src/modules/teamwork/meson.build
@@ -18,18 +18,4 @@ if config_h.has('HAVE_WAYLAND_ONLY') == false
18 ] 18 ]
19endif 19endif
20 20
21teamwork_dir = join_paths(dir_module_e, 'teamwork', module_arch) 21module += [teamwork_src, 'e-module-teamwork.edj']
22if get_option('teamwork') == true
23 config_h.set('USE_MODULE_TEAMWORK', '1')
24
25 module_files += join_paths(teamwork_dir, 'teamwork.so')
26 shared_module('teamwork',
27 teamwork_src,
28 include_directories: include_directories(module_includes),
29 name_prefix: '',
30 dependencies: module_deps,
31 install_dir: teamwork_dir,
32 install: true
33 )
34endif
35
diff --git a/src/modules/temperature/meson.build b/src/modules/temperature/meson.build
index d90d881d5..12fb62e35 100644
--- a/src/modules/temperature/meson.build
+++ b/src/modules/temperature/meson.build
@@ -6,18 +6,4 @@ temperature_src = [
6 'e_mod_main.h', 6 'e_mod_main.h',
7] 7]
8 8
9temperature_dir = join_paths(dir_module_e, 'temperature', module_arch) 9module += [temperature_src, 'e-module-temperature.edj']
10if get_option('temperature') == true
11 config_h.set('USE_MODULE_TEMPERATURE', '1')
12
13 module_files += join_paths(temperature_dir, 'temperature.so')
14 shared_module('temperature',
15 temperature_src,
16 include_directories: include_directories(module_includes),
17 name_prefix: '',
18 dependencies: module_deps,
19 install_dir: temperature_dir,
20 install: true
21 )
22endif
23
diff --git a/src/modules/tiling/meson.build b/src/modules/tiling/meson.build
index 1c7715ab3..285c98616 100644
--- a/src/modules/tiling/meson.build
+++ b/src/modules/tiling/meson.build
@@ -6,20 +6,4 @@ tiling_src = [
6 'window_tree.h', 6 'window_tree.h',
7] 7]
8 8
9tiling_mod_dir = join_paths(dir_module_e, 'tiling') 9module += [tiling_src, 'e-module-tiling.edj']
10tiling_dir = join_paths(tiling_mod_dir, module_arch)
11if get_option('tiling') == true
12 config_h.set('USE_MODULE_TILING', '1')
13
14 module_files += join_paths(tiling_dir, 'tiling.so')
15 shared_module('tiling',
16 tiling_src,
17 include_directories: include_directories(module_includes),
18 name_prefix: '',
19 dependencies: module_deps,
20 install_dir: tiling_dir,
21 install: true
22 )
23endif
24
25install_data('e-module-tiling.edj', install_dir: tiling_mod_dir, install : true)
diff --git a/src/modules/time/meson.build b/src/modules/time/meson.build
index 97ee6f34e..bd3898ede 100644
--- a/src/modules/time/meson.build
+++ b/src/modules/time/meson.build
@@ -6,18 +6,4 @@ time_src = [
6 'clock.h', 6 'clock.h',
7] 7]
8 8
9time_dir = join_paths(dir_module_e, 'time', module_arch) 9module += [time_src, 'e-module-time.edj']
10if get_option('time') == true
11 config_h.set('USE_MODULE_TIME', '1')
12
13 module_files += join_paths(time_dir, 'time.so')
14 shared_module('time',
15 time_src,
16 include_directories: include_directories(module_includes),
17 name_prefix: '',
18 dependencies: module_deps,
19 install_dir: time_dir,
20 install: true
21 )
22endif
23
diff --git a/src/modules/winlist/meson.build b/src/modules/winlist/meson.build
index 82d68274d..0bf3f0c42 100644
--- a/src/modules/winlist/meson.build
+++ b/src/modules/winlist/meson.build
@@ -6,18 +6,4 @@ winlist_src = [
6 'e_winlist.h', 6 'e_winlist.h',
7] 7]
8 8
9winlist_dir = join_paths(dir_module_e, 'winlist', module_arch) 9module += [winlist_src, 'e-module-winlist.edj']
10if get_option('winlist') == true
11 config_h.set('USE_MODULE_WINLIST', '1')
12
13 module_files += join_paths(winlist_dir, 'winlist.so')
14 shared_module('winlist',
15 winlist_src,
16 include_directories: include_directories(module_includes),
17 name_prefix: '',
18 dependencies: module_deps,
19 install_dir: winlist_dir,
20 install: true
21 )
22endif
23
diff --git a/src/modules/wireless/meson.build b/src/modules/wireless/meson.build
index 7b3df0ed5..07fe793ea 100644
--- a/src/modules/wireless/meson.build
+++ b/src/modules/wireless/meson.build
@@ -5,18 +5,4 @@ wireless_src = [
5 'wireless.h', 5 'wireless.h',
6] 6]
7 7
8wireless_dir = join_paths(dir_module_e, 'wireless', module_arch) 8module += [wireless_src, 'e-module-wireless.edj']
9if get_option('wireless') == true
10 config_h.set('USE_MODULE_WIRELESS', '1')
11
12 module_files += join_paths(wireless_dir, 'wireless.so')
13 shared_module('wireless',
14 wireless_src,
15 include_directories: include_directories(module_includes),
16 name_prefix: '',
17 dependencies: module_deps,
18 install_dir: wireless_dir,
19 install: true
20 )
21endif
22
diff --git a/src/modules/xkbswitch/meson.build b/src/modules/xkbswitch/meson.build
index ac682c50b..602592c28 100644
--- a/src/modules/xkbswitch/meson.build
+++ b/src/modules/xkbswitch/meson.build
@@ -9,18 +9,4 @@ xkbswitch_src = [
9 'gadget/mod.c' 9 'gadget/mod.c'
10] 10]
11 11
12xkbswitch_dir = join_paths(dir_module_e, 'xkbswitch', module_arch) 12module += [xkbswitch_src, 'e-module-xkbswitch.edj']
13if get_option('xkbswitch') == true
14 config_h.set('USE_MODULE_XKBSWITCH', '1')
15
16 module_files += join_paths(xkbswitch_dir, 'xkbswitch.so')
17 shared_module('xkbswitch',
18 xkbswitch_src,
19 include_directories: include_directories(module_includes),
20 name_prefix: '',
21 dependencies: module_deps,
22 install_dir: xkbswitch_dir,
23 install: true
24 )
25endif
26