e module build - make ibar and clock really simple and generic

now their build fiels are super easy to maintan. we should expand this
kind of ptterning aross the e build and then expand it to handle new
patters where needed like custom binaries (setuid or not), etc etc.
devs/derekf/for_derbyw
Carsten Haitzler 6 years ago
parent f6d9eeb99a
commit 822a0bcacb
  1. 6
      meson.build
  2. 27
      src/modules/clock/meson.build
  3. 27
      src/modules/ibar/meson.build

@ -400,10 +400,12 @@ subdir('src/bin')
module_files = []
module_ldflags = '-module -avoid-version'
module_includes = ['../../..', '../../bin', '../../bin/efx']
module_includes2 = [ '../..', '../bin', '../bin/efx' ]
module_deps = [deps_e, dep_dl]
subdir('src/modules/ibar')
subdir('src/modules/clock')
subdir('src/modules')
#subdir('src/modules/ibar')
#subdir('src/modules/clock')
subdir('src/modules/pager')
subdir('src/modules/pager_plain')
subdir('src/modules/battery')

@ -1,32 +1,5 @@
module = 'clock'
opt = 'clock'
conf = 'USE_MODULE_CLOCK'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

@ -1,32 +1,5 @@
module = 'ibar'
opt = 'ibar'
conf = 'USE_MODULE_IBAR'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

Loading…
Cancel
Save