build: Move dependency checks to appropriate location

This patch relocates the dependency checks to their appropriate
positions.

Change-Id: I4a16129401a40abdfa61e2a14a30918017f90fcf

diff --git a/meson.build b/meson.build
index d10803b39c031ca3f2007412b32ebc9b69d5554a..84d792bbd4f3d22f9fcae5460154d252baf31b65 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,6 @@ cc = meson.get_compiler('c')
 cpp = meson.get_compiler('cpp')
 
 release='ver-autocannoli-@0@.@1@'.format(e_version[0], e_version[1])
-
 module_arch = '@0@-gnueabi-@1@-@2@'.format(host_machine.system(), host_machine.cpu(), release)
 
 config_h.set_quoted('MODULE_ARCH'      , module_arch)
@@ -49,64 +48,6 @@ add_global_arguments(cc.get_supported_arguments([
   '-Wno-format-truncation',
 ]), language: 'c')
 
-cc.check_header('fnmatch.h', required: true)
-
-if cc.has_header('features.h')
-  config_h.set('HAVE_FEATURES_H', 1)
-endif
-
-optional_libc_funcs = ['setenv', 'unsetenv', 'clearenv']
-foreach f : optional_libc_funcs
-  if cc.has_function(f)
-    config_h.set('HAVE_' + f.to_upper(), 1)
-  endif
-endforeach
-
-if cpp.has_function('secure_getenv')
-  config_h.set('HAVE_SECURE_GETENV', '1')
-else
-  if cpp.has_function('__secure_getenv')
-    config_h.set('HAVE___SECURE_GETENV', '1')
-  endif
-endif
-
-dep_rt = cc.find_library('rt', required: false)
-dep_m = cc.find_library('m', required: false)
-dep_dl = cc.find_library('dl', required: false)
-
-dep_pthread = cc.find_library('pthread', required: true)
-
-efl_version = '>= 1.15.2'
-dep_eina = dependency('eina', version: efl_version, required: true)
-dep_eet = dependency('eet', version: efl_version, required: true)
-dep_ecore = dependency('ecore', required: true)
-dep_ecore_ipc = dependency('ecore-ipc', version: efl_version, required: true)
-dep_ecore_file = dependency('ecore-file', version: efl_version, required: true)
-dep_ecore_con = dependency('ecore-con', version: efl_version, required: true)
-dep_ecore_input = dependency('ecore-input', version: efl_version, required: true)
-dep_ecore_input_evas = dependency('ecore-input-evas', version: efl_version, required: true)
-dep_ecore_evas = dependency('ecore-evas', required: true)
-dep_evas = dependency('evas', version: efl_version, required: true)
-dep_edje = dependency('edje', version: efl_version, required: true)
-dep_eio = dependency('eio', version: efl_version, required: true)
-dep_eo = dependency('eo', version: efl_version, required: true)
-dep_eldbus = dependency('eldbus', version: efl_version, required: true)
-dep_eeze = dependency('eeze', version: efl_version, required: true)
-dep_libtbm = dependency('libtbm', required: true)
-dep_libtdm = dependency('libtdm', version: '>=1.0.0', required: true)
-dep_glib = dependency('glib-2.0', required: true)
-dep_gobject = dependency('gobject-2.0', required: true)
-dep_libds = dependency('libds', version: '>=0.1.13', required: true)
-dep_libds_tizen = dependency('libds-tizen', version: '>=0.1.4', required: true)
-dep_libds_xdg_shell_v6 = dependency('libds-xdg-shell-v6', required: true)
-dep_capi_system_device = dependency('capi-system-device', required: true)
-dep_capi_system_resource = dependency('capi-system-resource', required: true)
-dep_tzsh_server = dependency('tzsh-server', required: true)
-dep_pixman = dependency('pixman-1', required: true)
-dep_egl = dependency('egl', required: true)
-dep_udev = dependency('libudev', required: true)
-dep_systemd = dependency('libsystemd', version: '>= 209', required: true)
-
 e_cflags= [
   '-D_F_ZONE_WINDOW_ROTATION_',
   '-D_F_E_VIRTUAL_KEYBOARD_TYPE_',
@@ -130,64 +71,7 @@ add_global_arguments(e_configflags, language: 'c')
 
 config_h.set('_GNU_SOURCE', '1')
 
-dep_libinput = dependency('libinput', required: true)
-cpp.has_function('libinput_event_touch_get_major', dependencies: dep_libinput, required: true)
-cpp.has_function('libinput_event_pointer_get_scroll_value_v120', dependencies: dep_libinput, required: true)
-
-deps_cynara = [
-  dependency('cynara-client', required: true),
-  dependency('cynara-creds-socket', required: true),
-  dependency('cynara-session', required: true),
-  dependency('libsmack', required: true),
-]
-
-deps_wayland = [
-  dependency('wayland-server', version: '>= 1.17.0', required: true),
-  dependency('xkbcommon', required: true),
-  dependency('uuid', required: true),
-  dependency('xdg-shell-unstable-v5-server', required: true),
-  dependency('xdg-shell-unstable-v6-server', required: true),
-  dependency('tizen-remote-surface-server', required: true),
-  dependency('scaler-server', required: true),
-  dependency('screenshooter-server', required: true),
-  dependency('tizen-extension-server', required: true),
-  dependency('tizen-launch-server', required: true),
-  dependency('tizen-surface-server', required: true),
-  dependency('tizen-dpms-server', required: true),
-  dependency('presentation-time-server', required: true),
-  dependency('tizen-hwc-server', required: true),
-  dependency('linux-explicit-synchronization-unstable-v1-server', required: true),
-  dependency('wtz-foreign-server', required: true),
-  dependency('wtz-screen-server', required: true),
-  dependency('wtz-shell-server', required: true),
-  dependency('relative-pointer-unstable-v1-server', required: true),
-  dependency('pointer-constraints-unstable-v1-server', required: true),
-  dependency('single-pixel-buffer-v1-server', required: true),
-  dependency('wtz-blender-server', required: true),
-  dependency('libdrm', required: true),
-  dependency('wtz-video-shell-server', required: true),
-  dependency('wayland-tbm-server', required: true),
-  dependency('gbm', required: true),
-]
-
-dep_omp = dependency('openmp', required: false)
-if dep_omp.found()
-  config_h.set('HAVE_LIBGOMP', '1')
-endif
-
-dep_ttrace = dependency('ttrace', required: false)
-if dep_ttrace.found()
-  config_h.set('ENABLE_TTRACE', '1')
-endif
-
-dep_dlog = dependency('dlog', required: false)
-if dep_dlog.found()
-  config_h.set('HAVE_DLOG', '1')
-endif
-
-if get_option('function-trace')
-  config_h.set('ENABLE_FUNCTION_TRACE', '1')
-endif
+dep_dl = cc.find_library('dl', required: false)
 
 subdir('src')
 subdir('data')

diff --git a/src/bin/meson.build b/src/bin/meson.build
index ac918d6f59851ce9c90207d30c8ee9fd0fc965fd..9ad37726a2f5392679cbb115563f5c28c5b966ce 100644 (file)
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -1,3 +1,130 @@
+if get_option('function-trace')
+  config_h.set('ENABLE_FUNCTION_TRACE', '1')
+endif
+
+cc.check_header('fnmatch.h', required: true)
+
+if cc.has_header('features.h')
+  config_h.set('HAVE_FEATURES_H', 1)
+endif
+
+optional_libc_funcs = ['setenv', 'unsetenv', 'clearenv']
+foreach f : optional_libc_funcs
+  if cc.has_function(f)
+    config_h.set('HAVE_' + f.to_upper(), 1)
+  endif
+endforeach
+
+if cpp.has_function('secure_getenv')
+  config_h.set('HAVE_SECURE_GETENV', '1')
+else
+  if cpp.has_function('__secure_getenv')
+    config_h.set('HAVE___SECURE_GETENV', '1')
+  endif
+endif
+
+efl_version = '>= 1.15.2'
+deps_efl = [
+  dependency('eina', version: efl_version, required: true),
+  dependency('eet', version: efl_version, required: true),
+  dependency('ecore', required: true),
+  dependency('ecore-ipc', version: efl_version, required: true),
+  dependency('ecore-file', version: efl_version, required: true),
+  dependency('ecore-con', version: efl_version, required: true),
+  dependency('ecore-input', version: efl_version, required: true),
+  dependency('ecore-input-evas', version: efl_version, required: true),
+  dependency('ecore-evas', required: true),
+  dependency('evas', version: efl_version, required: true),
+  dependency('edje', version: efl_version, required: true),
+  dependency('eio', version: efl_version, required: true),
+  dependency('eo', version: efl_version, required: true),
+  dependency('eldbus', version: efl_version, required: true),
+  dependency('eeze', version: efl_version, required: true),
+]
+
+deps_wayland = [
+  dependency('wayland-server', version: '>= 1.17.0', required: true),
+  dependency('xkbcommon', required: true),
+  dependency('uuid', required: true),
+  dependency('xdg-shell-unstable-v5-server', required: true),
+  dependency('xdg-shell-unstable-v6-server', required: true),
+  dependency('tizen-remote-surface-server', required: true),
+  dependency('scaler-server', required: true),
+  dependency('screenshooter-server', required: true),
+  dependency('tizen-extension-server', required: true),
+  dependency('tizen-launch-server', required: true),
+  dependency('tizen-surface-server', required: true),
+  dependency('tizen-dpms-server', required: true),
+  dependency('presentation-time-server', required: true),
+  dependency('tizen-hwc-server', required: true),
+  dependency('linux-explicit-synchronization-unstable-v1-server', required: true),
+  dependency('wtz-foreign-server', required: true),
+  dependency('wtz-screen-server', required: true),
+  dependency('wtz-shell-server', required: true),
+  dependency('relative-pointer-unstable-v1-server', required: true),
+  dependency('pointer-constraints-unstable-v1-server', required: true),
+  dependency('single-pixel-buffer-v1-server', required: true),
+  dependency('wtz-blender-server', required: true),
+  dependency('libdrm', required: true),
+  dependency('wtz-video-shell-server', required: true),
+  dependency('wayland-tbm-server', required: true),
+  dependency('gbm', required: true),
+  dependency('libds', version: '>=0.1.13', required: true),
+  dependency('libds-tizen', version: '>=0.1.4', required: true),
+  dependency('libds-xdg-shell-v6', required: true),
+]
+
+deps_cynara = [
+  dependency('cynara-client', required: true),
+  dependency('cynara-creds-socket', required: true),
+  dependency('cynara-session', required: true),
+  dependency('libsmack', required: true),
+]
+
+dep_libinput = dependency('libinput', required: true)
+cpp.has_function('libinput_event_touch_get_major', dependencies: dep_libinput, required: true)
+cpp.has_function('libinput_event_pointer_get_scroll_value_v120', dependencies: dep_libinput, required: true)
+
+dep_omp = dependency('openmp', required: false)
+if dep_omp.found()
+  config_h.set('HAVE_LIBGOMP', '1')
+endif
+
+dep_ttrace = dependency('ttrace', required: false)
+if dep_ttrace.found()
+  config_h.set('ENABLE_TTRACE', '1')
+endif
+
+dep_dlog = dependency('dlog', required: false)
+if dep_dlog.found()
+  config_h.set('HAVE_DLOG', '1')
+endif
+
+deps_e = [
+  cc.find_library('rt', required: false),
+  cc.find_library('m', required: false),
+  cc.find_library('pthread', required: true),
+  dependency('libtbm', required: true),
+  dependency('libtdm', version: '>=1.0.0', required: true),
+  dependency('glib-2.0', required: true),
+  dependency('gobject-2.0', required: true),
+  dependency('capi-system-device', required: true),
+  dependency('capi-system-resource', required: true),
+  dependency('tzsh-server', required: true),
+  dependency('pixman-1', required: true),
+  dependency('egl', required: true),
+  dependency('libudev', required: true),
+  dependency('libsystemd', version: '>= 209', required: true),
+  dep_dl,
+  deps_efl,
+  dep_libinput,
+  deps_wayland,
+  deps_cynara,
+  dep_omp,
+  dep_ttrace,
+  dep_dlog,
+]
+
 e_inc = [
   common_inc,
   include_directories('compmgr'),
@@ -14,49 +141,6 @@ e_inc = [
   include_directories('log'),
 ]
 
-deps_e = [
-  dep_rt,
-  dep_m,
-  dep_dl,
-  dep_pthread,
-  dep_eina,
-  dep_eet,
-  dep_ecore,
-  dep_ecore_ipc,
-  dep_ecore_file,
-  dep_ecore_con,
-  dep_ecore_input,
-  dep_ecore_input_evas,
-  dep_ecore_evas,
-  dep_evas,
-  dep_edje,
-  dep_eio,
-  dep_eo,
-  dep_eldbus,
-  dep_eeze,
-  dep_libinput,
-  dep_libtbm,
-  dep_libtdm,
-  dep_glib,
-  dep_gobject,
-  dep_libds,
-  dep_libds_tizen,
-  dep_libds_xdg_shell_v6,
-  dep_capi_system_device,
-  dep_capi_system_resource,
-  dep_tzsh_server,
-  dep_libinput,
-  deps_wayland,
-  deps_cynara,
-  dep_omp,
-  dep_ttrace,
-  dep_dlog,
-  dep_pixman,
-  dep_egl,
-  dep_systemd,
-  dep_udev,
-]
-
 e_sources = [
   'e_main.c',
   'e_comp_screen.c',