build: enable subproject-based build
* Move existing phosphor-logging.wrap to the subprojects directory.
* Add wrap files for all openbmc dependencies.
* Fix up meson.build files to utilize subproject dependencies and follow
Meson conventions for dependency naming.
* Ensure wrap files are not ignored by .gitignore.
Tested: Built on a typical Linux development system and 'ninja test'
passed.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I167911f045ee1f27cc69bcba7be185762844a030
diff --git a/src/meson.build b/src/meson.build
index a85b3bc..4bb75a2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,16 +1,17 @@
+phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
+phosphor_logging_dep = dependency('phosphor-logging')
+sdbusplus_dep = dependency('sdbusplus')
+stdplus_dep = dependency('stdplus')
subdir('erase')
libeStoraged_deps = [
- dependency('sdbusplus'),
- dependency('phosphor-logging',
- fallback: ['phosphor-logging',
- 'phosphor_logging_dep'],
- ),
- dependency('openssl'),
dependency('libcryptsetup'),
- dependency('stdplus'),
- dependency('phosphor-dbus-interfaces'),
+ dependency('openssl'),
+ phosphor_dbus_interfaces_dep,
+ phosphor_logging_dep,
+ sdbusplus_dep,
+ stdplus_dep,
]
libeStoraged_lib = static_library(