WIPdevs/bu5hm4n/meson_wip

50 files changed, 139 insertions, 1014 deletions

diff --git a/meson.build b/meson.build
index f89d314ba2..2851ac0ed6 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ if git.found() == true
 	if git_cmd.returncode() == 0
 		git_version = git_cmd.stdout().strip()
 	endif
-endif	
+endif
 e_version_rev = '.'.join([meson.project_version(), git_version])
 #e_version_rev = e_version
 
@@ -397,72 +397,12 @@ subdir('src/bin')
 
 module_files = []
 module_ldflags = '-module -avoid-version'
+general_module_includes = ['../..', '../bin', '../bin/efx']
 module_includes = ['../../..', '../../bin', '../../bin/efx']
 module_deps = [deps_e, dep_dl]
 
-subdir('src/modules/ibar')
-subdir('src/modules/clock')
-subdir('src/modules/pager')
-subdir('src/modules/pager_plain')
-subdir('src/modules/battery')
-subdir('src/modules/temperature')
-subdir('src/modules/notification')
-subdir('src/modules/cpufreq')
-subdir('src/modules/ibox')
-subdir('src/modules/start')
-subdir('src/modules/winlist')
-subdir('src/modules/fileman')
-subdir('src/modules/fileman_opinfo')
-subdir('src/modules/wizard')
-subdir('src/modules/conf')
-subdir('src/modules/conf_theme')
-subdir('src/modules/conf_intl')
-subdir('src/modules/msgbus')
-subdir('src/modules/conf_applications')
-subdir('src/modules/conf_display')
-subdir('src/modules/conf_shelves')
-subdir('src/modules/conf_bindings')
-subdir('src/modules/conf_window_remembers')
-subdir('src/modules/conf_window_manipulation')
-subdir('src/modules/conf_menus')
-subdir('src/modules/conf_dialogs')
-subdir('src/modules/conf_performance')
-subdir('src/modules/conf_paths')
-subdir('src/modules/conf_interaction')
-subdir('src/modules/gadman')
-subdir('src/modules/mixer')
-subdir('src/modules/connman')
-subdir('src/modules/bluez4')
-subdir('src/modules/syscon')
-subdir('src/modules/everything')
-subdir('src/modules/systray')
-subdir('src/modules/appmenu')
-subdir('src/modules/quickaccess')
-subdir('src/modules/teamwork')
-subdir('src/modules/lokker')
-subdir('src/modules/shot')
-subdir('src/modules/backlight')
-subdir('src/modules/tasks')
-subdir('src/modules/conf_randr')
-subdir('src/modules/xkbswitch')
-subdir('src/modules/tiling')
-subdir('src/modules/music-control')
-subdir('src/modules/packagekit')
-subdir('src/modules/wl_desktop_shell')
-subdir('src/modules/wl_x11')
-subdir('src/modules/wl_wl')
-subdir('src/modules/wl_buffer')
-#subdir('src/modules/wl_fb')
-subdir('src/modules/wl_drm')
-subdir('src/modules/wl_text_input')
-subdir('src/modules/wl_weekeyboard')
-subdir('src/modules/policy_mobile')
-subdir('src/modules/geolocation')
-subdir('src/modules/xwayland')
-subdir('src/modules/wireless')
-subdir('src/modules/time')
-subdir('src/modules/sysinfo')
-subdir('src/modules/luncher')
+
+subdir('src/modules')
 
 subdir('config')
 
diff --git a/src/modules/appmenu/meson.build b/src/modules/appmenu/meson.build
index c2f241fe9b..e6264f535f 100644
--- a/src/modules/appmenu/meson.build
+++ b/src/modules/appmenu/meson.build
@@ -1,8 +1,3 @@
-appmenu_dist = [
-	'e-module-appmenu.edj',
-	'module.desktop',
-]
-
 appmenu_src = [
 	'e_mod_main.c',
         'e_mod_appmenu_render.c',
@@ -10,22 +5,4 @@ appmenu_src = [
         'e_mod_appmenu_private.h'
 ]
 
-appmenu_dir = join_paths(dir_module_e, 'appmenu', module_arch)
-if get_option('appmenu') == true
-	config_h.set('USE_MODULE_APPMENU', '1')
-
-	install_data(appmenu_dist,
-		install_dir: join_paths(dir_module_e, 'appmenu')
-	)
-
-        module_files += join_paths(appmenu_dir, 'appmenu.so')
-	shared_module('appmenu',
-                appmenu_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: appmenu_dir,
-                install: true
-        )
-endif
-
+module += [appmenu_src, 'e-module-appmenu.edj']
diff --git a/src/modules/backlight/meson.build b/src/modules/backlight/meson.build
index 939090420d..9a0f4c7aa8 100644
--- a/src/modules/backlight/meson.build
+++ b/src/modules/backlight/meson.build
@@ -1,30 +1,7 @@
-backlight_dist = [
-	'e-module-backlight.edj',
-	'module.desktop',
-]
-
 backlight_src = [
 	'e_mod_main.c',
 	'gadget/backlight.c',
 	'gadget/mod.c'
 ]
 
-backlight_dir = join_paths(dir_module_e, 'backlight', module_arch)
-if get_option('backlight') == true
-	config_h.set('USE_MODULE_BACKLIGHT', '1')
-
-	install_data(backlight_dist,
-		install_dir: join_paths(dir_module_e, 'backlight')
-	)
-
-        module_files += join_paths(backlight_dir, 'backlight.so')
-	shared_module('backlight',
-                backlight_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: backlight_dir,
-                install: true
-        )
-endif
-
+module += [backlight_src, 'e-module-backlight.edj']
diff --git a/src/modules/battery/meson.build b/src/modules/battery/meson.build
index 4d138a099c..b4af5acf76 100644
--- a/src/modules/battery/meson.build
+++ b/src/modules/battery/meson.build
@@ -1,8 +1,3 @@
-battery_dist = [
-	'e-module-battery.edj',
-	'module.desktop',
-]
-
 battery_src = [
 	'e_mod_config.c',
 	'e_mod_main.c',
@@ -10,36 +5,21 @@ battery_src = [
 ]
 
 if config_h.has('HAVE_EEZE') == true
-	battery_src += 'e_mod_udev.c'
+  battery_src += 'e_mod_udev.c'
 elif host_machine.system().contains('bsd') == true
-	battery_src += 'e_mod_sysctl.c'
+  battery_src += 'e_mod_sysctl.c'
 else
-	battery_src += 'e_mod_upower.c'
+  battery_src += 'e_mod_upower.c'
 endif
 
-battery_dir = join_paths(dir_module_e, 'battery', module_arch)
-if get_option('battery') == true
-	config_h.set('USE_MODULE_BATTERY', '1')
-
-	install_data(battery_dist,
-		install_dir: join_paths(dir_module_e, 'battery')
-	)
+module += [battery_src, 'e-module-battery.edj']
 
-        module_files += join_paths(battery_dir, 'battery.so')
-	shared_module('battery',
-                battery_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: battery_dir,
-                install: true
-        )
+battery_dir = join_paths(dir_module_e, 'battery', module_arch)
 
-	executable('batget',
-		'batget.c',
-		include_directories: include_directories(module_includes),
-		dependencies: [dep_eina, dep_ecore, dep_ecore_con, dep_ecore_file],
-		install_dir: battery_dir,
-		install: true
-	)
-endif
+executable('batget',
+    'batget.c',
+    include_directories: include_directories(module_includes),
+    dependencies: [dep_eina, dep_ecore, dep_ecore_con, dep_ecore_file],
+    install_dir: battery_dir,
+    install: true
+)
diff --git a/src/modules/bluez4/meson.build b/src/modules/bluez4/meson.build
index 7c6e107ea5..cac194fbc5 100644
--- a/src/modules/bluez4/meson.build
+++ b/src/modules/bluez4/meson.build
@@ -1,30 +1,7 @@
-bluez4_dist = [
-	'e-module-bluez4.edj',
-	'module.desktop',
-]
-
 bluez4_src = [
 	'agent.c',
 	'ebluez4.c',
 	'e_mod_main.c'
 ]
 
-bluez4_dir = join_paths(dir_module_e, 'bluez4', module_arch)
-if get_option('bluez4') == true
-	config_h.set('USE_MODULE_BLUEZ4', '1')
-
-	install_data(bluez4_dist,
-		install_dir: join_paths(dir_module_e, 'bluez4')
-	)
-
-        module_files += join_paths(bluez4_dir, 'bluez4.so')
-	shared_module('bluez4',
-                bluez4_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: bluez4_dir,
-                install: true
-        )
-endif
-
+module += [bluez4_src, 'e-module-bluez4.edj']
diff --git a/src/modules/clock/meson.build b/src/modules/clock/meson.build
index 8fc7302442..0a83b52777 100644
--- a/src/modules/clock/meson.build
+++ b/src/modules/clock/meson.build
@@ -1,29 +1,6 @@
-clock_dist = [
-	'e-module-clock.edj',
-	'module.desktop',
-]
-
 clock_src = [
 	'e_mod_config.c',
 	'e_mod_main.c'
 ]
 
-clock_dir = join_paths(dir_module_e, 'clock', module_arch)
-if get_option('clock') == true
-	config_h.set('USE_MODULE_CLOCK', '1')
-
-	install_data(clock_dist,
-		install_dir: join_paths(dir_module_e, 'clock')
-	)
-
-        module_files += join_paths(clock_dir, 'clock.so')
-	shared_module('clock',
-                clock_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: clock_dir,
-                install: true
-        )
-endif
-
+module += [clock_src, 'e-module-clock.edj']
diff --git a/src/modules/conf/meson.build b/src/modules/conf/meson.build
index 75e02d4d92..ad37111902 100644
--- a/src/modules/conf/meson.build
+++ b/src/modules/conf/meson.build
@@ -1,30 +1,7 @@
-conf_dist = [
-	'e-module-conf.edj',
-	'module.desktop',
-]
-
 conf_src = [
 	'e_conf.c',
 	'e_mod_config.c',
 	'e_mod_main.c'
 ]
 
-conf_dir = join_paths(dir_module_e, 'conf', module_arch)
-if get_option('conf') == true
-	config_h.set('USE_MODULE_CONF', '1')
-
-	install_data(conf_dist,
-		install_dir: join_paths(dir_module_e, 'conf')
-	)
-
-        module_files += join_paths(conf_dir, 'conf.so')
-	shared_module('conf',
-                conf_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_dir,
-                install: true
-        )
-endif
-
+module += [conf_src, 'e-module-conf.edj']
diff --git a/src/modules/conf_applications/meson.build b/src/modules/conf_applications/meson.build
index 3975a93970..086d0f5af8 100644
--- a/src/modules/conf_applications/meson.build
+++ b/src/modules/conf_applications/meson.build
@@ -12,22 +12,4 @@ conf_applications_src = [
 	'e_mod_main.h',
 ]
 
-conf_applications_dir = join_paths(dir_module_e, 'conf_applications', module_arch)
-if get_option('conf-applications') == true
-	config_h.set('USE_MODULE_CONF_APPLICATIONS', '1')
-
-	install_data(conf_applications_dist,
-		install_dir: join_paths(dir_module_e, 'conf_applications')
-	)
-
-        module_files += join_paths(conf_applications_dir, 'conf_applications.so')
-	shared_module('conf_applications',
-                conf_applications_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_applications_dir,
-                install: true
-        )
-endif
-
+module += [conf_applications_src, 'e-module-conf_applications.edj']
diff --git a/src/modules/conf_bindings/meson.build b/src/modules/conf_bindings/meson.build
index c6507f68dc..3a02c42805 100644
--- a/src/modules/conf_bindings/meson.build
+++ b/src/modules/conf_bindings/meson.build
@@ -1,7 +1,3 @@
-conf_bindings_dist = [
-	'module.desktop',
-]
-
 conf_bindings_src = [
 	'e_int_config_acpibindings.c',
 	'e_int_config_edgebindings.c',
@@ -12,22 +8,4 @@ conf_bindings_src = [
 	'e_mod_main.h',
 ]
 
-conf_bindings_dir = join_paths(dir_module_e, 'conf_bindings', module_arch)
-if get_option('conf-bindings') == true
-	config_h.set('USE_MODULE_CONF_BINDINGS', '1')
-
-	install_data(conf_bindings_dist,
-		install_dir: join_paths(dir_module_e, 'conf_bindings')
-	)
-
-        module_files += join_paths(conf_bindings_dir, 'conf_bindings.so')
-	shared_module('conf_bindings',
-                conf_bindings_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_bindings_dir,
-                install: true
-        )
-endif
-
+module += [conf_bindings_src]
diff --git a/src/modules/conf_dialogs/meson.build b/src/modules/conf_dialogs/meson.build
index 6ef8e8c3b3..64f628ddeb 100644
--- a/src/modules/conf_dialogs/meson.build
+++ b/src/modules/conf_dialogs/meson.build
@@ -1,8 +1,3 @@
-conf_dialogs_dist = [
-	'e-module-conf_dialogs.edj',
-	'module.desktop',
-]
-
 conf_dialogs_src = [
 	'e_int_config_dialogs.c',
 	'e_int_config_profiles.c',
@@ -10,22 +5,4 @@ conf_dialogs_src = [
 	'e_mod_main.h',
 ]
 
-conf_dialogs_dir = join_paths(dir_module_e, 'conf_dialogs', module_arch)
-if get_option('conf-dialogs') == true
-	config_h.set('USE_MODULE_CONF_DIALOGS', '1')
-
-	install_data(conf_dialogs_dist,
-		install_dir: join_paths(dir_module_e, 'conf_dialogs')
-	)
-
-        module_files += join_paths(conf_dialogs_dir, 'conf_dialogs.so')
-	shared_module('conf_dialogs',
-                conf_dialogs_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_dialogs_dir,
-                install: true
-        )
-endif
-
+module += [conf_dialogs_src, 'e-module-conf_dialogs.edj']
diff --git a/src/modules/conf_display/meson.build b/src/modules/conf_display/meson.build
index d6d3dd47ea..44cc7ef130 100644
--- a/src/modules/conf_display/meson.build
+++ b/src/modules/conf_display/meson.build
@@ -1,7 +1,3 @@
-conf_display_dist = [
-	'module.desktop',
-]
-
 conf_display_src = [
 	'e_int_config_desk.c',
 	'e_int_config_desklock.c',
@@ -12,23 +8,4 @@ conf_display_src = [
 	'e_mod_main.c',
 	'e_mod_main.h',
 ]
-
-conf_display_dir = join_paths(dir_module_e, 'conf_display', module_arch)
-if get_option('conf-display') == true
-	config_h.set('USE_MODULE_CONF_DISPLAY', '1')
-
-	install_data(conf_display_dist,
-		install_dir: join_paths(dir_module_e, 'conf_display')
-	)
-
-        module_files += join_paths(conf_display_dir, 'conf_display.so')
-	shared_module('conf_display',
-                conf_display_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_display_dir,
-                install: true
-        )
-endif
-
+module += [conf_display_src]
diff --git a/src/modules/conf_interaction/meson.build b/src/modules/conf_interaction/meson.build
index f33026f356..da8fbd231c 100644
--- a/src/modules/conf_interaction/meson.build
+++ b/src/modules/conf_interaction/meson.build
@@ -9,23 +9,4 @@ conf_interaction_src = [
 	'e_mod_main.c',
 	'e_mod_main.h',
 ]
-
-conf_interaction_dir = join_paths(dir_module_e, 'conf_interaction', module_arch)
-if get_option('conf-interaction') == true
-	config_h.set('USE_MODULE_CONF_INTERACTION', '1')
-
-	install_data(conf_interaction_dist,
-		install_dir: join_paths(dir_module_e, 'conf_interaction')
-	)
-
-        module_files += join_paths(conf_interaction_dir, 'conf_interaction.so')
-	shared_module('conf_interaction',
-                conf_interaction_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_interaction_dir,
-                install: true
-        )
-endif
-
+module +=[conf_interaction_src, 'e-module-conf_interaction.edj']
diff --git a/src/modules/conf_intl/meson.build b/src/modules/conf_intl/meson.build
index bffa6cbc90..93e26d76bc 100644
--- a/src/modules/conf_intl/meson.build
+++ b/src/modules/conf_intl/meson.build
@@ -1,7 +1,3 @@
-conf_intl_dist = [
-	'module.desktop',
-]
-
 conf_intl_src = [
 	'e_int_config_imc.c',
 	'e_int_config_imc_import.c',
@@ -10,22 +6,4 @@ conf_intl_src = [
 	'e_mod_main.h',
 ]
 
-conf_intl_dir = join_paths(dir_module_e, 'conf_intl', module_arch)
-if get_option('conf-intl') == true
-	config_h.set('USE_MODULE_CONF_INTL', '1')
-
-	install_data(conf_intl_dist,
-		install_dir: join_paths(dir_module_e, 'conf_intl')
-	)
-
-        module_files += join_paths(conf_intl_dir, 'conf_intl.so')
-	shared_module('conf_intl',
-                conf_intl_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_intl_dir,
-                install: true
-        )
-endif
-
+module += [conf_intl_src]
diff --git a/src/modules/conf_menus/meson.build b/src/modules/conf_menus/meson.build
index d699b8a30c..aabf3576f0 100644
--- a/src/modules/conf_menus/meson.build
+++ b/src/modules/conf_menus/meson.build
@@ -1,30 +1,6 @@
-conf_menus_dist = [
-	'e-module-conf_menus.edj',
-	'module.desktop',
-]
-
 conf_menus_src = [
 	'e_int_config_menus.c',
 	'e_mod_main.c',
 	'e_mod_main.h',
 ]
-
-conf_menus_dir = join_paths(dir_module_e, 'conf_menus', module_arch)
-if get_option('conf-menus') == true
-	config_h.set('USE_MODULE_CONF_MENUS', '1')
-
-	install_data(conf_menus_dist,
-		install_dir: join_paths(dir_module_e, 'conf_menus')
-	)
-
-        module_files += join_paths(conf_menus_dir, 'conf_menus.so')
-	shared_module('conf_menus',
-                conf_menus_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_menus_dir,
-                install: true
-        )
-endif
-
+module += [conf_menus_src, 'e-module-conf_menus.edj']
diff --git a/src/modules/conf_paths/meson.build b/src/modules/conf_paths/meson.build
index 0e62e776b0..7e95c8272c 100644
--- a/src/modules/conf_paths/meson.build
+++ b/src/modules/conf_paths/meson.build
@@ -1,8 +1,3 @@
-conf_paths_dist = [
-	'e-module-conf_paths.edj',
-	'module.desktop',
-]
-
 conf_paths_src = [
 	'e_int_config_env.c',
 	'e_int_config_paths.c',
@@ -10,22 +5,4 @@ conf_paths_src = [
 	'e_mod_main.h',
 ]
 
-conf_paths_dir = join_paths(dir_module_e, 'conf_paths', module_arch)
-if get_option('conf-paths') == true
-	config_h.set('USE_MODULE_CONF_PATHS', '1')
-
-	install_data(conf_paths_dist,
-		install_dir: join_paths(dir_module_e, 'conf_paths')
-	)
-
-        module_files += join_paths(conf_paths_dir, 'conf_paths.so')
-	shared_module('conf_paths',
-                conf_paths_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_paths_dir,
-                install: true
-        )
-endif
-
+module += [conf_paths_src, 'e-module-conf_paths.edj']
diff --git a/src/modules/conf_performance/meson.build b/src/modules/conf_performance/meson.build
index 85c122c3f7..8a6cc74134 100644
--- a/src/modules/conf_performance/meson.build
+++ b/src/modules/conf_performance/meson.build
@@ -10,22 +10,4 @@ conf_performance_src = [
 	'e_mod_main.h',
 ]
 
-conf_performance_dir = join_paths(dir_module_e, 'conf_performance', module_arch)
-if get_option('conf-performance') == true
-	config_h.set('USE_MODULE_CONF_PERFORMANCE', '1')
-
-	install_data(conf_performance_dist,
-		install_dir: join_paths(dir_module_e, 'conf_performance')
-	)
-
-        module_files += join_paths(conf_performance_dir, 'conf_performance.so')
-	shared_module('conf_performance',
-                conf_performance_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_performance_dir,
-                install: true
-        )
-endif
-
+module += [conf_performance_src, 'e-module-conf_performance.edj']
diff --git a/src/modules/conf_randr/meson.build b/src/modules/conf_randr/meson.build
index 2ce882dbad..cb9cd70ff9 100644
--- a/src/modules/conf_randr/meson.build
+++ b/src/modules/conf_randr/meson.build
@@ -1,8 +1,3 @@
-conf_randr_dist = [
-	'e-module-conf_randr.edj',
-	'module.desktop',
-]
-
 conf_randr_src = [
 	'e_int_config_randr2.c',
 	'e_mod_main.c',
@@ -10,22 +5,4 @@ conf_randr_src = [
 	'e_mod_main.h',
 ]
 
-conf_randr_dir = join_paths(dir_module_e, 'conf_randr', module_arch)
-if get_option('conf-randr') == true
-	config_h.set('USE_MODULE_CONF_RANDR', '1')
-
-	install_data(conf_randr_dist,
-		install_dir: join_paths(dir_module_e, 'conf_randr')
-	)
-
-        module_files += join_paths(conf_randr_dir, 'conf_randr.so')
-	shared_module('conf_randr',
-                conf_randr_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_randr_dir,
-                install: true
-        )
-endif
-
+module += [conf_randr_src, 'e-module-conf_randr.edj']
diff --git a/src/modules/conf_shelves/meson.build b/src/modules/conf_shelves/meson.build
index 387aeec86f..145535def0 100644
--- a/src/modules/conf_shelves/meson.build
+++ b/src/modules/conf_shelves/meson.build
@@ -10,22 +10,4 @@ conf_shelves_src = [
 	'e_mod_main.h',
 ]
 
-conf_shelves_dir = join_paths(dir_module_e, 'conf_shelves', module_arch)
-if get_option('conf-shelves') == true
-	config_h.set('USE_MODULE_CONF_SHELVES', '1')
-
-	install_data(conf_shelves_dist,
-		install_dir: join_paths(dir_module_e, 'conf_shelves')
-	)
-
-        module_files += join_paths(conf_shelves_dir, 'conf_shelves.so')
-	shared_module('conf_shelves',
-                conf_shelves_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_shelves_dir,
-                install: true
-        )
-endif
-
+module += [conf_shelves_src, 'e-module-conf_shelves.edj']
diff --git a/src/modules/conf_theme/meson.build b/src/modules/conf_theme/meson.build
index 28ff663c47..07c30b8586 100644
--- a/src/modules/conf_theme/meson.build
+++ b/src/modules/conf_theme/meson.build
@@ -1,7 +1,3 @@
-conf_theme_dist = [
-	'module.desktop',
-]
-
 conf_theme_src = [
 	'e_int_config_borders.c',
 	'e_int_config_color_classes.c',
@@ -16,22 +12,4 @@ conf_theme_src = [
 	'e_mod_main.h',
 ]
 
-conf_theme_dir = join_paths(dir_module_e, 'conf_theme', module_arch)
-if get_option('conf-theme') == true
-	config_h.set('USE_MODULE_CONF_THEME', '1')
-
-	install_data(conf_theme_dist,
-		install_dir: join_paths(dir_module_e, 'conf_theme')
-	)
-
-        module_files += join_paths(conf_theme_dir, 'conf_theme.so')
-	shared_module('conf_theme',
-                conf_theme_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_theme_dir,
-                install: true
-        )
-endif
-
+module += [conf_theme_src]
diff --git a/src/modules/conf_window_manipulation/meson.build b/src/modules/conf_window_manipulation/meson.build
index e404b3c839..c0e5f6b6c3 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 = [
 	'e_mod_main.h',
 ]
 
-conf_window_manipulation_dir = join_paths(dir_module_e, 'conf_window_manipulation', module_arch)
-if get_option('conf-window-manipulation') == true
-	config_h.set('USE_MODULE_CONF_WINDOW_MANIPULATION', '1')
-
-	install_data(conf_window_manipulation_dist,
-		install_dir: join_paths(dir_module_e, 'conf_window_manipulation')
-	)
-
-        module_files += join_paths(conf_window_manipulation_dir, 'conf_window_manipulation.so')
-	shared_module('conf_window_manipulation',
-                conf_window_manipulation_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_window_manipulation_dir,
-                install: true
-        )
-endif
-
+module += [conf_window_manipulation_src, 'e-module-conf_winmanip.edj']
diff --git a/src/modules/conf_window_remembers/meson.build b/src/modules/conf_window_remembers/meson.build
index ed4f1bc8db..ebbb5737fa 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 = [
 	'e_mod_main.h',
 ]
 
-conf_window_remembers_dir = join_paths(dir_module_e, 'conf_window_remembers', module_arch)
-if get_option('conf-window-remembers') == true
-	config_h.set('USE_MODULE_CONF_WINDOW_REMEMBERS', '1')
-
-	install_data(conf_window_remembers_dist,
-		install_dir: join_paths(dir_module_e, 'conf_window_remembers')
-	)
-
-        module_files += join_paths(conf_window_remembers_dir, 'conf_window_remembers.so')
-	shared_module('conf_window_remembers',
-                conf_window_remembers_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: conf_window_remembers_dir,
-                install: true
-        )
-endif
-
+module += [conf_window_remembers_src, 'e-module-conf_window_remembers.edj']
diff --git a/src/modules/connman/meson.build b/src/modules/connman/meson.build
index 7d1327a883..681fcca028 100644
--- a/src/modules/connman/meson.build
+++ b/src/modules/connman/meson.build
@@ -1,8 +1,3 @@
-connman_dist = [
-	'e-module-connman.edj',
-	'module.desktop',
-]
-
 connman_src = [
 	'agent.c',
 	'e_connman.c',
@@ -12,22 +7,4 @@ connman_src = [
 	'e_mod_main.h',
 ]
 
-connman_dir = join_paths(dir_module_e, 'connman', module_arch)
-if get_option('connman') == true
-	config_h.set('USE_MODULE_CONNMAN', '1')
-
-	install_data(connman_dist,
-		install_dir: join_paths(dir_module_e, 'connman')
-	)
-
-        module_files += join_paths(connman_dir, 'connman.so')
-	shared_module('connman',
-                connman_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: connman_dir,
-                install: true
-        )
-endif
-
+module += [connman_src, 'e-module-connman.edj']
diff --git a/src/modules/cpufreq/meson.build b/src/modules/cpufreq/meson.build
index e69f255b0a..23ddb28d6a 100644
--- a/src/modules/cpufreq/meson.build
+++ b/src/modules/cpufreq/meson.build
@@ -10,31 +10,15 @@ cpufreq_src = [
 	'e_mod_main.h',
 ]
 
-cpufreq_dir = join_paths(dir_module_e, 'cpufreq', module_arch)
-if get_option('cpufreq') == true
-	config_h.set('USE_MODULE_CPUFREQ', '1')
-
-	install_data(cpufreq_dist,
-		install_dir: join_paths(dir_module_e, 'cpufreq')
-	)
+module += [cpufreq_src, 'e-module-cpufreq.edj']
 
-        module_files += join_paths(cpufreq_dir, 'cpufreq.so')
-	shared_module('cpufreq',
-                cpufreq_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: cpufreq_dir,
-                install: true
-        )
-
-	executable('freqset',
-		'freqset.c',
-		c_args: suid_cflags,
-		link_args: suid_ldflags,
-		install_dir: cpufreq_dir,
-		install: true
-	)
-	suid_exes += join_paths(cpufreq_dir, 'freqset')
-endif
+cpufreq_dir = join_paths(dir_module_e, 'cpufreq', module_arch)
 
+executable('freqset',
+    'freqset.c',
+    c_args: suid_cflags,
+    link_args: suid_ldflags,
+    install_dir: cpufreq_dir,
+    install: true
+)
+suid_exes += join_paths(cpufreq_dir, 'freqset')
diff --git a/src/modules/everything/meson.build b/src/modules/everything/meson.build
index 15f8619c29..5c543264f0 100644
--- a/src/modules/everything/meson.build
+++ b/src/modules/everything/meson.build
@@ -1,7 +1,6 @@
 everything_dist = [
 	'e-module-everything.edj',
 	'e-module-everything-start.edj',
-	'module.desktop',
 ]
 
 everything_src = [
@@ -32,24 +31,15 @@ everything_src = [
 	'md5.h',
 ]
 
+module += [everything_src]
+
 everything_dir = join_paths(dir_module_e, 'everything', module_arch)
 if get_option('everything') == true
-	config_h.set('USE_MODULE_EVERYTHING', '1')
 
 	install_data(everything_dist,
 		install_dir: join_paths(dir_module_e, 'everything')
 	)
 
-        module_files += join_paths(everything_dir, 'everything.so')
-	shared_module('everything',
-                everything_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: everything_dir,
-                install: true
-        )
-
 	install_headers(['evry_api.h', 'evry_types.h'],
 		subdir: 'enlightenment'
 	)
diff --git a/src/modules/fileman/meson.build b/src/modules/fileman/meson.build
index 629d9527f2..dc4cceb0cb 100644
--- a/src/modules/fileman/meson.build
+++ b/src/modules/fileman/meson.build
@@ -1,8 +1,3 @@
-fileman_dist = [
-	'e-module-fileman.edj',
-	'module.desktop',
-]
-
 fileman_src = [
 	'e_fwin.c',
 	'e_fwin_nav.c',
@@ -15,22 +10,4 @@ fileman_src = [
 	'e_mod_main.h',
 ]
 
-fileman_dir = join_paths(dir_module_e, 'fileman', module_arch)
-if get_option('fileman') == true
-	config_h.set('USE_MODULE_FILEMAN', '1')
-
-	install_data(fileman_dist,
-		install_dir: join_paths(dir_module_e, 'fileman')
-	)
-
-        module_files += join_paths(fileman_dir, 'fileman.so')
-	shared_module('fileman',
-                fileman_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: fileman_dir,
-                install: true
-        )
-endif
-
+module += [fileman_src, 'e-module-fileman.edj']
diff --git a/src/modules/fileman_opinfo/meson.build b/src/modules/fileman_opinfo/meson.build
index b726b4f14b..ec61334bd4 100644
--- a/src/modules/fileman_opinfo/meson.build
+++ b/src/modules/fileman_opinfo/meson.build
@@ -1,28 +1,5 @@
-fileman_opinfo_dist = [
-	'e-module-fileman_opinfo.edj',
-	'module.desktop',
-]
-
 fileman_opinfo_src = [
 	'e_mod_main.c',
 ]
 
-fileman_opinfo_dir = join_paths(dir_module_e, 'fileman_opinfo', module_arch)
-if get_option('fileman-opinfo') == true
-	config_h.set('USE_MODULE_FILEMAN_OPINFO', '1')
-
-	install_data(fileman_opinfo_dist,
-		install_dir: join_paths(dir_module_e, 'fileman_opinfo')
-	)
-
-        module_files += join_paths(fileman_opinfo_dir, 'fileman_opinfo.so')
-	shared_module('fileman_opinfo',
-                fileman_opinfo_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: fileman_opinfo_dir,
-                install: true
-        )
-endif
-
+module += [fileman_opinfo_src, 'e-module-fileman_opinfo.edj']
diff --git a/src/modules/gadman/meson.build b/src/modules/gadman/meson.build
index d6e4d61da3..9bc77a72fa 100644
--- a/src/modules/gadman/meson.build
+++ b/src/modules/gadman/meson.build
@@ -1,8 +1,3 @@
-gadman_dist = [
-	'e-module-gadman.edj',
-	'module.desktop',
-]
-
 gadman_src = [
 	'e_mod_config.c',
 	'e_mod_gadman.c',
@@ -10,22 +5,4 @@ gadman_src = [
 	'e_mod_gadman.h',
 ]
 
-gadman_dir = join_paths(dir_module_e, 'gadman', module_arch)
-if get_option('gadman') == true
-	config_h.set('USE_MODULE_GADMAN', '1')
-
-	install_data(gadman_dist,
-		install_dir: join_paths(dir_module_e, 'gadman')
-	)
-
-        module_files += join_paths(gadman_dir, 'gadman.so')
-	shared_module('gadman',
-                gadman_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: gadman_dir,
-                install: true
-        )
-endif
-
+module += [gadman_src, 'e-module-gadman.edj']
diff --git a/src/modules/ibar/meson.build b/src/modules/ibar/meson.build
index f5bffbffec..cde7deb4f8 100644
--- a/src/modules/ibar/meson.build
+++ b/src/modules/ibar/meson.build
@@ -1,30 +1,7 @@
-ibar_dist = [
-	'e-module-ibar.edj',
-	'module.desktop',
-]
-
 ibar_src = [
 	'e_mod_config.c',
 	'e_mod_main.c',
 	'e_mod_main.h',
 ]
 
-ibar_dir = join_paths(dir_module_e, 'ibar', module_arch)
-if get_option('ibar') == true
-	config_h.set('USE_MODULE_IBAR', '1')
-
-	install_data(ibar_dist,
-		install_dir: join_paths(dir_module_e, 'ibar')
-	)
-
-        module_files += join_paths(ibar_dir, 'ibar.so')
-	shared_module('ibar',
-                ibar_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: ibar_dir,
-                install: true
-        )
-endif
-
+module += [ibar_src, 'e-module-ibar.edj']
diff --git a/src/modules/ibox/meson.build b/src/modules/ibox/meson.build
index 0a9c40468e..8e443458e5 100644
--- a/src/modules/ibox/meson.build
+++ b/src/modules/ibox/meson.build
@@ -1,30 +1,7 @@
-ibox_dist = [
-	'e-module-ibox.edj',
-	'module.desktop',
-]
-
 ibox_src = [
 	'e_mod_config.c',
 	'e_mod_main.c',
 	'e_mod_main.h',
 ]
 
-ibox_dir = join_paths(dir_module_e, 'ibox', module_arch)
-if get_option('ibox') == true
-	config_h.set('USE_MODULE_IBOX', '1')
-
-	install_data(ibox_dist,
-		install_dir: join_paths(dir_module_e, 'ibox')
-	)
-
-        module_files += join_paths(ibox_dir, 'ibox.so')
-	shared_module('ibox',
-                ibox_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: ibox_dir,
-                install: true
-        )
-endif
-
+module += [ibox_src, 'e-module-ibox.edj']
diff --git a/src/modules/luncher/meson.build b/src/modules/luncher/meson.build
index 62c89bc729..93bead156f 100644
--- a/src/modules/luncher/meson.build
+++ b/src/modules/luncher/meson.build
@@ -6,18 +6,4 @@ luncher_src = [
 	'luncher.h',
 ]
 
-luncher_dir = join_paths(dir_module_e, 'luncher', module_arch)
-if get_option('luncher') == true
-	config_h.set('USE_MODULE_LUNCHER', '1')
-
-        module_files += join_paths(luncher_dir, 'luncher.so')
-	shared_module('luncher',
-                luncher_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: luncher_dir,
-                install: true
-        )
-endif
-
+module += [luncher_src, 'e-module-luncher.edj']
diff --git a/src/modules/meson.build b/src/modules/meson.build
new file mode 100644
index 0000000000..00a3693b40
--- /dev/null
+++ b/src/modules/meson.build
@@ -0,0 +1,55 @@
+easy_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']
+custom_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']
+
+foreach module_name : custom_modules
+  message('Configure module ' + module_name)
+  subdir(module_name)
+endforeach
+
+foreach module_name : easy_modules
+  module_option_name = '-'.join(module_name.split('_'))
+  if get_option(module_option_name) == true
+    module = []
+    config_h.set(''.join(['USE_MODULE_', module_name.to_upper()]), '1')
+    message('Configure module ' + module_name)
+    subdir(module_name)
+
+    module_source_raw = module.get(0, '')
+    module_theme = module.get(1, '')
+    module_source = []
+
+    #convert the module sources to relative paths
+    foreach s : module_source_raw
+      module_source += join_paths([module_name, s])
+    endforeach
+
+    #generate the install dirs
+    module_object_install_dir = join_paths(dir_module_e, module_name, module_arch)
+    module_install_dir = join_paths(dir_module_e, module_name)
+
+    #add the module files
+    module_files += join_paths(module_object_install_dir, ''.join([module_name, '.so']))
+
+    #set the module.so to be compiled
+    shared_module(module_name,
+                  module_source,
+                  include_directories: include_directories(general_module_includes),
+                  name_prefix: '',
+                  dependencies: module_deps,
+                  install_dir: module_object_install_dir,
+                  install: true
+    )
+
+    #install theme if its there
+    if module_theme != ''
+      install_data(join_paths([module_name, module_theme]),
+                   install_dir: module_install_dir,
+                   install : true)
+    endif
+
+    #install module.desktop
+    install_data(join_paths([module_name, 'module.desktop']),
+                 install_dir: module_install_dir,
+                 install : true)
+  endif
+endforeach
diff --git a/src/modules/msgbus/meson.build b/src/modules/msgbus/meson.build
index a2c52ed814..76d76cae12 100644
--- a/src/modules/msgbus/meson.build
+++ b/src/modules/msgbus/meson.build
@@ -9,18 +9,4 @@ msgbus_src = [
 	'e_mod_main.h',
 ]
 
-msgbus_dir = join_paths(dir_module_e, 'msgbus', module_arch)
-if get_option('msgbus') == true
-	config_h.set('USE_MODULE_MSGBUS', '1')
-
-        module_files += join_paths(msgbus_dir, 'msgbus.so')
-	shared_module('msgbus',
-                msgbus_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: msgbus_dir,
-                install: true
-        )
-endif
-
+module += [msgbus_src, 'e-module-msgbus.edj']
diff --git a/src/modules/notification/meson.build b/src/modules/notification/meson.build
index 75f3ee37ab..d600db7f8f 100644
--- a/src/modules/notification/meson.build
+++ b/src/modules/notification/meson.build
@@ -5,18 +5,4 @@ notification_src = [
 	'e_mod_main.h',
 ]
 
-notification_dir = join_paths(dir_module_e, 'notification', module_arch)
-if get_option('notification') == true
-	config_h.set('USE_MODULE_NOTIFICATION', '1')
-
-        module_files += join_paths(notification_dir, 'notification.so')
-	shared_module('notification',
-                notification_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: notification_dir,
-                install: true
-        )
-endif
-
+module += [notification_src, 'e-module-notification.edj']
diff --git a/src/modules/packagekit/meson.build b/src/modules/packagekit/meson.build
index 2fdb959887..5969d4e63f 100644
--- a/src/modules/packagekit/meson.build
+++ b/src/modules/packagekit/meson.build
@@ -7,18 +7,4 @@ packagekit_src = [
 	'e_mod_packagekit.h',
 ]
 
-packagekit_dir = join_paths(dir_module_e, 'packagekit', module_arch)
-if get_option('packagekit') == true
-	config_h.set('USE_MODULE_PACKAGEKIT', '1')
-
-        module_files += join_paths(packagekit_dir, 'packagekit.so')
-	shared_module('packagekit',
-                packagekit_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: packagekit_dir,
-                install: true
-        )
-endif
-
+module += [packagekit_src, 'e-module-packagekit.edj']
diff --git a/src/modules/pager/meson.build b/src/modules/pager/meson.build
index 93a5921dee..11b241bfe2 100644
--- a/src/modules/pager/meson.build
+++ b/src/modules/pager/meson.build
@@ -8,18 +8,4 @@ pager_src = [
 	'gadget/config.c'
 ]
 
-pager_dir = join_paths(dir_module_e, 'pager', module_arch)
-if get_option('pager') == true
-	config_h.set('USE_MODULE_PAGER', '1')
-
-        module_files += join_paths(pager_dir, 'pager.so')
-	shared_module('pager',
-                pager_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: pager_dir,
-                install: true
-        )
-endif
-
+module += [pager_src, 'e-module-pager.edj']
diff --git a/src/modules/pager_plain/meson.build b/src/modules/pager_plain/meson.build
index 0475791b1c..60c8cf414f 100644
--- a/src/modules/pager_plain/meson.build
+++ b/src/modules/pager_plain/meson.build
@@ -4,18 +4,4 @@ pager_plain_src = [
 	'e_mod_main.h',
 ]
 
-pager_plain_dir = join_paths(dir_module_e, 'pager_plain', module_arch)
-if get_option('pager-plain') == true
-	config_h.set('USE_MODULE_PAGER_PLAIN', '1')
-
-        module_files += join_paths(pager_plain_dir, 'pager_plain.so')
-	shared_module('pager_plain',
-                pager_plain_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: pager_plain_dir,
-                install: true
-        )
-endif
-
+module += [pager_plain_src, 'e-module-pager-plain.edj']
diff --git a/src/modules/quickaccess/meson.build b/src/modules/quickaccess/meson.build
index fcda28f4b6..e52cba7999 100644
--- a/src/modules/quickaccess/meson.build
+++ b/src/modules/quickaccess/meson.build
@@ -7,18 +7,4 @@ quickaccess_src = [
 	'e_mod_main.h',
 ]
 
-quickaccess_dir = join_paths(dir_module_e, 'quickaccess', module_arch)
-if get_option('quickaccess') == true
-	config_h.set('USE_MODULE_QUICKACCESS', '1')
-
-        module_files += join_paths(quickaccess_dir, 'quickaccess.so')
-	shared_module('quickaccess',
-                quickaccess_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: quickaccess_dir,
-                install: true
-        )
-endif
-
+module += [quickaccess_src, 'e-module-quickaccess.edj']
diff --git a/src/modules/shot/meson.build b/src/modules/shot/meson.build
index ba2b0d1650..9c43af1913 100644
--- a/src/modules/shot/meson.build
+++ b/src/modules/shot/meson.build
@@ -2,18 +2,4 @@ shot_src = [
 	'e_mod_main.c',
 ]
 
-shot_dir = join_paths(dir_module_e, 'shot', module_arch)
-if get_option('shot') == true
-	config_h.set('USE_MODULE_SHOT', '1')
-
-        module_files += join_paths(shot_dir, 'shot.so')
-	shared_module('shot',
-                shot_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: shot_dir,
-                install: true
-        )
-endif
-
+module += [shot_src, 'e-module-shot.edj']
diff --git a/src/modules/start/meson.build b/src/modules/start/meson.build
index 57eab69f81..4412c9d1ae 100644
--- a/src/modules/start/meson.build
+++ b/src/modules/start/meson.build
@@ -3,18 +3,4 @@ start_src = [
 	'start.c',
 ]
 
-start_dir = join_paths(dir_module_e, 'start', module_arch)
-if get_option('start') == true
-	config_h.set('USE_MODULE_START', '1')
-
-        module_files += join_paths(start_dir, 'start.so')
-	shared_module('start',
-                start_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: start_dir,
-                install: true
-        )
-endif
-
+module += [start_src, 'e-module-start.edj']
diff --git a/src/modules/syscon/meson.build b/src/modules/syscon/meson.build
index b21ed37ec6..a4f00ab414 100644
--- a/src/modules/syscon/meson.build
+++ b/src/modules/syscon/meson.build
@@ -6,18 +6,4 @@ syscon_src = [
 	'e_mod_main.h',
 ]
 
-syscon_dir = join_paths(dir_module_e, 'syscon', module_arch)
-if get_option('syscon') == true
-	config_h.set('USE_MODULE_SYSCON', '1')
-
-        module_files += join_paths(syscon_dir, 'syscon.so')
-	shared_module('syscon',
-                syscon_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: syscon_dir,
-                install: true
-        )
-endif
-
+module += [syscon_src, 'e-module-syscon.edj']
diff --git a/src/modules/sysinfo/meson.build b/src/modules/sysinfo/meson.build
index 0a349f8071..c5f8235811 100644
--- a/src/modules/sysinfo/meson.build
+++ b/src/modules/sysinfo/meson.build
@@ -44,29 +44,17 @@ else
 	]
 endif
 
-sysinfo_dir = join_paths(dir_module_e, 'sysinfo', module_arch)
-if get_option('sysinfo') == true
-	config_h.set('USE_MODULE_SYSINFO', '1')
-
-        module_files += join_paths(sysinfo_dir, 'sysinfo.so')
-	shared_module('sysinfo',
-                sysinfo_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: sysinfo_dir,
-                install: true
-        )
+module += [sysinfo_src, 'e-module-sysinfo.edj']
 
-	executable('cpuclock_sysfs',
-		'cpuclock/cpuclock_sysfs.c',
-		include_directories: include_directories(module_includes),
-		dependencies: dep_crypt,
-		c_args: suid_cflags,
-		link_args: suid_ldflags,
-		install_dir: join_paths(dir_module_e, 'sysinfo'),
-		install: true
-	)
-	suid_exes == join_paths(sysinfo_dir, 'cpuclock_sysfs')
-endif
+sysinfo_dir = join_paths(dir_module_e, 'sysinfo', module_arch)
 
+executable('cpuclock_sysfs',
+	'cpuclock/cpuclock_sysfs.c',
+	include_directories: include_directories(module_includes),
+	dependencies: dep_crypt,
+	c_args: suid_cflags,
+	link_args: suid_ldflags,
+	install_dir: join_paths(dir_module_e, 'sysinfo'),
+	install: true
+)
+suid_exes == join_paths(sysinfo_dir, 'cpuclock_sysfs')
diff --git a/src/modules/systray/meson.build b/src/modules/systray/meson.build
index 224598108d..9ace1275ec 100644
--- a/src/modules/systray/meson.build
+++ b/src/modules/systray/meson.build
@@ -7,18 +7,4 @@ systray_src = [
 	'e_mod_notifier_host_private.h',
 ]
 
-systray_dir = join_paths(dir_module_e, 'systray', module_arch)
-if get_option('systray') == true
-	config_h.set('USE_MODULE_SYSTRAY', '1')
-
-        module_files += join_paths(systray_dir, 'systray.so')
-	shared_module('systray',
-                systray_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: systray_dir,
-                install: true
-        )
-endif
-
+module += [systray_src, 'e-module-systray.edj']
diff --git a/src/modules/tasks/meson.build b/src/modules/tasks/meson.build
index 81fd90074d..0021435d80 100644
--- a/src/modules/tasks/meson.build
+++ b/src/modules/tasks/meson.build
@@ -4,18 +4,4 @@ tasks_src = [
 	'e_mod_main.h',
 ]
 
-tasks_dir = join_paths(dir_module_e, 'tasks', module_arch)
-if get_option('tasks') == true
-	config_h.set('USE_MODULE_TASKS', '1')
-
-        module_files += join_paths(tasks_dir, 'tasks.so')
-	shared_module('tasks',
-                tasks_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: tasks_dir,
-                install: true
-        )
-endif
-
+module += [tasks_src, 'e-module-tasks.edj']
diff --git a/src/modules/teamwork/meson.build b/src/modules/teamwork/meson.build
index d031447fc8..514ef1b7f2 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
 	]
 endif
 
-teamwork_dir = join_paths(dir_module_e, 'teamwork', module_arch)
-if get_option('teamwork') == true
-	config_h.set('USE_MODULE_TEAMWORK', '1')
-
-        module_files += join_paths(teamwork_dir, 'teamwork.so')
-	shared_module('teamwork',
-                teamwork_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: teamwork_dir,
-                install: true
-        )
-endif
-
+module += [teamwork_src, 'e-module-teamwork.edj']
diff --git a/src/modules/temperature/meson.build b/src/modules/temperature/meson.build
index d90d881d59..12fb62e353 100644
--- a/src/modules/temperature/meson.build
+++ b/src/modules/temperature/meson.build
@@ -6,18 +6,4 @@ temperature_src = [
 	'e_mod_main.h',
 ]
 
-temperature_dir = join_paths(dir_module_e, 'temperature', module_arch)
-if get_option('temperature') == true
-	config_h.set('USE_MODULE_TEMPERATURE', '1')
-
-        module_files += join_paths(temperature_dir, 'temperature.so')
-	shared_module('temperature',
-                temperature_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: temperature_dir,
-                install: true
-        )
-endif
-
+module += [temperature_src, 'e-module-temperature.edj']
diff --git a/src/modules/tiling/meson.build b/src/modules/tiling/meson.build
index 1c7715ab30..285c986166 100644
--- a/src/modules/tiling/meson.build
+++ b/src/modules/tiling/meson.build
@@ -6,20 +6,4 @@ tiling_src = [
 	'window_tree.h',
 ]
 
-tiling_mod_dir = join_paths(dir_module_e, 'tiling')
-tiling_dir = join_paths(tiling_mod_dir, module_arch)
-if get_option('tiling') == true
-	config_h.set('USE_MODULE_TILING', '1')
-
-        module_files += join_paths(tiling_dir, 'tiling.so')
-	shared_module('tiling',
-                tiling_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: tiling_dir,
-                install: true
-        )
-endif
-
-install_data('e-module-tiling.edj', install_dir: tiling_mod_dir, install : true)
+module += [tiling_src, 'e-module-tiling.edj']
diff --git a/src/modules/time/meson.build b/src/modules/time/meson.build
index 97ee6f34ef..bd3898edef 100644
--- a/src/modules/time/meson.build
+++ b/src/modules/time/meson.build
@@ -6,18 +6,4 @@ time_src = [
 	'clock.h',
 ]
 
-time_dir = join_paths(dir_module_e, 'time', module_arch)
-if get_option('time') == true
-	config_h.set('USE_MODULE_TIME', '1')
-
-        module_files += join_paths(time_dir, 'time.so')
-	shared_module('time',
-                time_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: time_dir,
-                install: true
-        )
-endif
-
+module += [time_src, 'e-module-time.edj']
diff --git a/src/modules/winlist/meson.build b/src/modules/winlist/meson.build
index 82d68274d6..0bf3f0c425 100644
--- a/src/modules/winlist/meson.build
+++ b/src/modules/winlist/meson.build
@@ -6,18 +6,4 @@ winlist_src = [
 	'e_winlist.h',
 ]
 
-winlist_dir = join_paths(dir_module_e, 'winlist', module_arch)
-if get_option('winlist') == true
-	config_h.set('USE_MODULE_WINLIST', '1')
-
-        module_files += join_paths(winlist_dir, 'winlist.so')
-	shared_module('winlist',
-                winlist_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: winlist_dir,
-                install: true
-        )
-endif
-
+module += [winlist_src, 'e-module-winlist.edj']
diff --git a/src/modules/wireless/meson.build b/src/modules/wireless/meson.build
index 7b3df0ed56..07fe793ea9 100644
--- a/src/modules/wireless/meson.build
+++ b/src/modules/wireless/meson.build
@@ -5,18 +5,4 @@ wireless_src = [
 	'wireless.h',
 ]
 
-wireless_dir = join_paths(dir_module_e, 'wireless', module_arch)
-if get_option('wireless') == true
-	config_h.set('USE_MODULE_WIRELESS', '1')
-
-        module_files += join_paths(wireless_dir, 'wireless.so')
-	shared_module('wireless',
-                wireless_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: wireless_dir,
-                install: true
-        )
-endif
-
+module += [wireless_src, 'e-module-wireless.edj']
diff --git a/src/modules/xkbswitch/meson.build b/src/modules/xkbswitch/meson.build
index ac682c50b1..602592c287 100644
--- a/src/modules/xkbswitch/meson.build
+++ b/src/modules/xkbswitch/meson.build
@@ -9,18 +9,4 @@ xkbswitch_src = [
 	'gadget/mod.c'
 ]
 
-xkbswitch_dir = join_paths(dir_module_e, 'xkbswitch', module_arch)
-if get_option('xkbswitch') == true
-	config_h.set('USE_MODULE_XKBSWITCH', '1')
-
-        module_files += join_paths(xkbswitch_dir, 'xkbswitch.so')
-	shared_module('xkbswitch',
-                xkbswitch_src,
-                include_directories: include_directories(module_includes),
-                name_prefix: '',
-                dependencies: module_deps,
-                install_dir: xkbswitch_dir,
-                install: true
-        )
-endif
-
+module += [xkbswitch_src, 'e-module-xkbswitch.edj']