forked from enlightenment/efl
build: efl-one track all subdirs correctly
this was missed before, so the subdirectories have not been correctly added. With this you can now simply build with efl-one with including <Elementary.h> Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11893
This commit is contained in:
parent
28cf881861
commit
7da3eb84ab
|
@ -361,6 +361,7 @@ efl_one_parts = []
|
||||||
efl_one_deps = []
|
efl_one_deps = []
|
||||||
efl_one_eo_deps = []
|
efl_one_eo_deps = []
|
||||||
efl_one_include_dirs = []
|
efl_one_include_dirs = []
|
||||||
|
efl_one_sub_dirs = []
|
||||||
tmp_empty = declare_dependency()
|
tmp_empty = declare_dependency()
|
||||||
|
|
||||||
foreach package : subprojects
|
foreach package : subprojects
|
||||||
|
@ -462,7 +463,9 @@ foreach package : subprojects
|
||||||
foreach subdir : package_header_subdirs
|
foreach subdir : package_header_subdirs
|
||||||
tmp_package_subdirs += join_paths(package_version_name, subdir)
|
tmp_package_subdirs += join_paths(package_version_name, subdir)
|
||||||
endforeach
|
endforeach
|
||||||
|
if (package[8] and get_option('efl-one'))
|
||||||
|
efl_one_sub_dirs += [package_version_name] + tmp_package_subdirs
|
||||||
|
endif
|
||||||
pkgconfig.generate(tmp_lib,
|
pkgconfig.generate(tmp_lib,
|
||||||
name : '-'.join(package_name.split('_')),
|
name : '-'.join(package_name.split('_')),
|
||||||
subdirs : [package_version_name] + tmp_package_subdirs,
|
subdirs : [package_version_name] + tmp_package_subdirs,
|
||||||
|
@ -503,6 +506,7 @@ if (get_option('efl-one'))
|
||||||
|
|
||||||
pkgconfig.generate(
|
pkgconfig.generate(
|
||||||
name : 'efl-one',
|
name : 'efl-one',
|
||||||
|
subdirs : efl_one_sub_dirs,
|
||||||
description: 'Configureation for efl in one big fat .so',
|
description: 'Configureation for efl in one big fat .so',
|
||||||
libraries : [efl_one] + eina_pc_deps, #eina is a special case here which drags in m dl & threads
|
libraries : [efl_one] + eina_pc_deps, #eina is a special case here which drags in m dl & threads
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue