meson build - reformat and trim build files a bit to be more compact

working on it...

src/bin/e_fm/meson.build

@@ -1,4 +1,4 @@
-deps_efm = [
+deps = [
   dep_eina,
   dep_ecore,
   dep_ecore_con,
@@ -15,7 +15,7 @@ if config_h.has('HAVE_UDISKS_MOUNT') == true
     'e_fm_main_udisks2.c',
     'e_fm_main_udisks2.h'
   ]
-	deps_efm += [dep_eldbus]
+  deps += [ dep_eldbus ]
 endif
 
 eeze_src = []
@@ -25,10 +25,10 @@ if config_h.has('HAVE_EEZE_MOUNT') == true
     'e_fm_main_eeze.c',
     'e_fm_main_eeze.h'
   ]
-	deps_efm += [dep_eeze, dep_eet]
+  deps += [ dep_eeze, dep_eet ]
 endif
 
-efm_src = [
+src = [
   'e_fm_main.c',
   'e_fm_main.h',
   'e_fm_ipc.c',
@@ -41,10 +41,9 @@ efm_src = [
   eeze_src
 ]
 
-executable('enlightenment_fm',
-	[efm_src],
+executable('enlightenment_fm', src,
            include_directories: include_directories('../../../', '../..', '.', '..'),
-	dependencies: [deps_efm],
-	install_dir: dir_e_utils,
-	install: true
+           dependencies       : deps,
+           install_dir        : dir_e_utils,
+           install            : true
 )

src/bin/generated/meson.build

@@ -12,9 +12,9 @@ protos = [
 proto_c = []
 proto_h = []
 
-foreach proto: protos
-	proto_h += gen_scanner_server.process(proto)
-	proto_c += gen_scanner_impl.process(proto)
+foreach p: protos
+  proto_h += gen_scanner_server.process(p)
+  proto_c += gen_scanner_impl.process(p)
 endforeach
 
 wayland_proto_c = proto_c

src/bin/meson.build

@@ -6,11 +6,11 @@ e_fm_shared_types = configuration_data()
 e_fm_shared_types.set10('EEZE_MOUNT_CONFIG', config_h.has('HAVE_EEZE_MOUNT'))
 e_fm_shared_types.set10('DBUS_MOUNT_CONFIG', config_h.has('HAVE_UDISKS_MOUNT'))
 
-configure_file(input: 'e_fm_shared_types.h.in',
-	output: 'e_fm_shared_types.h',
+configure_file(input        : 'e_fm_shared_types.h.in',
+               output       : 'e_fm_shared_types.h',
                configuration: e_fm_shared_types,
-	install: true,
-	install_dir: dir_include_e)
+               install      : true,
+               install_dir  : dir_include_e)
 
 deps_e = [
   dep_rt,
@@ -35,7 +35,7 @@ deps_e = [
   dep_elementary
 ]
 
-requires_e = ' '.join([
+req = ' '.join([
   'eina >= 1.19.99',
   'eet',
   'ecore',
@@ -51,10 +51,10 @@ requires_e = ' '.join([
   requires_eeze,
   'eldbus',
   'emotion',
-	'elementary',
+  'elementary'
 ])
 
-src_e = [
+src = [
   'e_about.c',
   'e_acpi.c',
   'e_actions.c',
@@ -224,7 +224,7 @@ src_e = [
   'efx/efx_zoom.c'
 ]
 
-headers_e = [
+hdr = [
   'efx/e_Efx.h',
   'e_about.h',
   'e_acpi.h',
@@ -390,7 +390,7 @@ headers_e = [
 ]
 
 if config_h.has('HAVE_WAYLAND') == true
-	src_e += [
+  src += [
     'e_comp_wl_data.c',
     'e_comp_wl_input.c',
     'e_comp_wl_dmabuf.c',
@@ -400,140 +400,128 @@ if config_h.has('HAVE_WAYLAND') == true
     wayland_proto_c,
     wayland_proto_h
   ]
-	headers_e += [
+  hdr += [
     'e_comp_wl_data.h',
     'e_comp_wl_dmabuf.h',
     'e_comp_wl_input.h',
     'e_comp_wl.h'
   ]
   deps_e += dep_wayland
-	requires_e = ' '.join([requires_e, requires_wayland])
+  req = ' '.join([req, requires_wayland])
 endif
 
 if config_h.has('HAVE_WAYLAND_ONLY') == false
-	src_e += [
+  src += [
     'e_comp_x.c',
     'e_comp_x_randr.c',
     'e_alert.c',
     'e_xsettings.c'
   ]
   deps_e += dep_ecore_x
-	requires_e = ' '.join([requires_e, 'ecore-x'])
+  req = ' '.join([req, 'ecore-x'])
 endif
 
-install_headers(
-	headers_e,
-	subdir: 'enlightenment'
-)
+install_headers( hdr, subdir: 'enlightenment' )
 
-executable('enlightenment',
-	src_e,
+executable('enlightenment', src,
            include_directories: include_directories('.', 'efx', 'generated', '../..'),
-	dependencies: deps_e,
-	c_args: '-DE_LOGGING=1',
-	link_args: '-rdynamic',
-	install_dir: dir_bin,
-	install: true
-)
+           dependencies       : deps_e,
+           c_args             : '-DE_LOGGING=1',
+           link_args          : '-rdynamic',
+           install_dir        : dir_bin,
+           install            : true
+          )
 
 dir_e_utils = join_paths(dir_lib, 'enlightenment/utils')
 
 executable('enlightenment_imc',
-	['e_config_data.c',
+           [ 'e_config_data.c',
              'e_imc_main.c',
-		'e_intl_data.c'],
+             'e_intl_data.c'
+           ],
            include_directories: include_directories('.', '../..'),
-	dependencies: [dep_eina, dep_eet, dep_ecore_file],
-	install_dir: dir_bin,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_eet, dep_ecore_file ],
+           install_dir        : dir_bin,
+           install            : true
+          )
 
 executable('enlightenment_start',
-	['e_start_main.c'],
+           [ 'e_start_main.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [dep_eina, dep_evas],
-	install_dir: dir_bin,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_evas ],
+           install_dir        : dir_bin,
+           install            : true
+          )
 
 executable('enlightenment_filemanager',
-	['e_fm_cmdline.c'],
+           [ 'e_fm_cmdline.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [dep_eina, dep_ecore, dep_ecore_file, dep_eldbus, dep_efreet],
-	install_dir: dir_bin,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_ecore, dep_ecore_file, dep_eldbus, dep_efreet ],
+           install_dir        : dir_bin,
+           install            : true
+          )
 
 executable('enlightenment_open',
-	['e_open.c'],
+           [ 'e_open.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [dep_eina, dep_ecore, dep_efreet, dep_efreet_mime],
-	install_dir: dir_bin,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_ecore, dep_efreet, dep_efreet_mime ],
+           install_dir        : dir_bin,
+           install            : true
+          )
 
 executable('enlightenment_askpass',
-	['e_askpass_main.c'],
-	dependencies: [dep_elementary],
-	install_dir: dir_bin,
-	install: true
-)
-
+           [ 'e_askpass_main.c' ],
+           dependencies: [ dep_elementary ],
+           install_dir : dir_bin,
+           install     : true
+          )
 
 executable('enlightenment_backlight',
-	['e_backlight_main.c'],
+           [ 'e_backlight_main.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [dep_eina, dep_eeze],
-	c_args: suid_cflags,
-	link_args: suid_ldflags,
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_eeze ],
+           c_args             : suid_cflags,
+           link_args          : suid_ldflags,
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 suid_exes += join_paths(dir_e_utils, 'enlightenment_backlight')
 
 executable('enlightenment_fm_op',
-	['e_fm_op.c'],
+           [ 'e_fm_op.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [dep_m, dep_eina, dep_ecore, dep_ecore_file],
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [ dep_m, dep_eina, dep_ecore, dep_ecore_file ],
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 
 executable('enlightenment_thumb',
-	['e_thumb_main.c', 'e_sha1.c', 'e_user.c'],
+           [ 'e_thumb_main.c', 'e_sha1.c', 'e_user.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [
-		dep_m, dep_eina, dep_eet, dep_evas, dep_ecore,
-		dep_ecore_ipc, dep_ecore_evas, dep_efreet,
-		dep_ecore_file, dep_edje, dep_emotion
-	],
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [ dep_m, dep_eina, dep_eet, dep_evas, dep_ecore, dep_ecore_ipc, dep_ecore_evas, dep_efreet, dep_ecore_file, dep_edje, dep_emotion ],
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 
 executable('enlightenment_elm_cfgtool',
-	['e_elm_cfgtool_main.c'],
+           [ 'e_elm_cfgtool_main.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [
-		dep_m, dep_elementary
-	],
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [ dep_m, dep_elementary ],
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 
 executable('enlightenment_static_grabber',
-	['e_static_grab.c'],
+           [ 'e_static_grab.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [
-		dep_eina, dep_eet
-	],
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_eet ],
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 
 deps_e_alert = []
 if config_h.has('HAVE_WAYLAND') == true
-	deps_e_alert += [dep_ecore_drm2, dep_ecore_input, dep_dl]
+  deps_e_alert += [ dep_ecore_drm2, dep_ecore_input, dep_dl ]
 endif
 if config_h.has('HAVE_WAYLAND_ONLY') == false
   deps_e_alert += [
@@ -543,34 +531,31 @@ if config_h.has('HAVE_WAYLAND_ONLY') == false
   ]
 endif
 executable('enlightenment_alert',
-	['e_alert_main.c'],
+           [ 'e_alert_main.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [
-		dep_eina, dep_ecore, dep_evas, dep_ecore_ipc,
-		deps_e_alert
-	],
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [ dep_eina, dep_ecore, dep_evas, dep_ecore_ipc, deps_e_alert ],
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 
 executable('enlightenment_sys',
-	['e_sys_main.c', 'e_sys_l2ping.c'],
+           [ 'e_sys_main.c', 'e_sys_l2ping.c' ],
            include_directories: include_directories('../..'),
-	dependencies: [dep_eina, dep_ecore, dep_bluez],
-	c_args: suid_cflags,
-	link_args: suid_ldflags,
-	install_dir: dir_e_utils,
-	install: true
-)
+           dependencies       : [dep_eina, dep_ecore, dep_bluez],
+           c_args             : suid_cflags,
+           link_args          : suid_ldflags,
+           install_dir        : dir_e_utils,
+           install            : true
+          )
 suid_exes += join_paths(dir_e_utils, 'enlightenment_sys')
 
 if freebsd == true
   executable('enlightenment_ckpasswd',
              'e_ckpasswd_main.c',
-		c_args: suid_cflags,
-		link_args: suid_ldflags,
+             c_args     : suid_cflags,
+             link_args  : suid_ldflags,
              install_dir: dir_e_utils,
-		install: true
+             install    : true
             )
   suid_exes += join_paths(dir_e_utils, 'enlightenment_ckpasswd')
 endif