build: move plugins directory to src/plugins
We are going to allow including the plugin sources built within the ModemManager daemon binary; moving the sources within the daemon sources directory makes it easier.
This commit is contained in:

committed by
Aleksander Morgado

parent
072d7ac906
commit
e14b904cbd
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
test_conf = {
|
test_conf = {
|
||||||
'abs_top_builddir': build_root,
|
'abs_top_builddir': build_root,
|
||||||
'PLUGIN_BUILD_SUBDIR': 'plugins/',
|
'PLUGIN_BUILD_SUBDIR': 'src/plugins/',
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
|
@@ -55,9 +55,9 @@ source_root = meson.current_source_dir()
|
|||||||
build_root = meson.current_build_dir()
|
build_root = meson.current_build_dir()
|
||||||
|
|
||||||
build_aux_dir = source_root / 'build-aux'
|
build_aux_dir = source_root / 'build-aux'
|
||||||
plugins_dir = source_root / 'plugins'
|
|
||||||
po_dir = source_root / 'po'
|
po_dir = source_root / 'po'
|
||||||
src_dir = source_root / 'src'
|
src_dir = source_root / 'src'
|
||||||
|
plugins_dir = source_root / 'src/plugins'
|
||||||
|
|
||||||
top_inc = include_directories('.')
|
top_inc = include_directories('.')
|
||||||
|
|
||||||
@@ -397,7 +397,6 @@ endif
|
|||||||
|
|
||||||
subdir('libmm-glib')
|
subdir('libmm-glib')
|
||||||
subdir('src')
|
subdir('src')
|
||||||
subdir('plugins')
|
|
||||||
subdir('cli')
|
subdir('cli')
|
||||||
|
|
||||||
if enable_tests
|
if enable_tests
|
||||||
|
@@ -336,3 +336,6 @@ install_data(
|
|||||||
if enable_tests
|
if enable_tests
|
||||||
subdir('tests')
|
subdir('tests')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Additional vendor plugins
|
||||||
|
subdir('plugins')
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user