build: split source and header directories
Split the headers and source to simplify the install_header
directive such that we no longer need to specify cpp files
to exclude in the install_header call.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iac4c38f95e690aa8ef8ecf87b032f55a1a31409c
diff --git a/meson.build b/meson.build
index 8ea6b9b..678b960 100644
--- a/meson.build
+++ b/meson.build
@@ -8,17 +8,18 @@
)
libsystemd_pkg = dependency('libsystemd')
-root_inc = include_directories('.')
+root_inc = include_directories('include')
libsdbusplus_src = files(
- 'sdbusplus/exception.cpp',
- 'sdbusplus/sdbus.cpp',
- 'sdbusplus/server/transaction.cpp',
+ 'src/exception.cpp',
+ 'src/sdbus.cpp',
+ 'src/server/transaction.cpp',
)
libsdbusplus = library(
'sdbusplus',
libsdbusplus_src,
+ include_directories: root_inc,
dependencies: libsystemd_pkg,
version: meson.project_version(),
install: true,
@@ -43,12 +44,9 @@
subdir('test')
install_subdir(
- 'sdbusplus',
+ 'include/sdbusplus',
install_dir: get_option('includedir'),
strip_directory: false,
- # TODO (stwcx): Once we remove autotools, we can move these files
- # out of the same directory as the headers and remove this.
- exclude_files: [ 'exception.cpp', 'sdbus.cpp', 'server/transaction.cpp' ],
)
import('pkgconfig').generate(