diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-12-11 20:16:46 +0200 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-12-11 20:28:34 +0200 |
commit | 830031892b875e284fa14bb13b5d6bd1e8a9173b (patch) | |
tree | 05369040903c86c6f8234679723f79332e9a3b7b | |
parent | 0763b8a80e3d2d2f44a98cd8e5c789879f72e249 (diff) |
build: Clean up file names variables
The build system defines two variables, public_api and sources, that
store the names of the public headers and the source files respectively.
These files will need to be referenced when generating documentation
from source code, so let's make the variable names more descriptive:
- Rename public_api to libcamera_api and use the files() function
- Rename sources to libcamera_sources
- Add a libcamera_headers variable to hold the internal headers
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r-- | include/libcamera/meson.build | 6 | ||||
-rw-r--r-- | src/libcamera/meson.build | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 8fb21e98..8c82675a 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -1,6 +1,6 @@ -public_api = [ +libcamera_api = files([ 'libcamera.h', -] +]) -install_headers(public_api, +install_headers(libcamera_api, subdir : 'libcamera') diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index fe38f8b2..0c44b5ab 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -1,14 +1,19 @@ -sources = files([ +libcamera_sources = files([ 'log.cpp', 'main.cpp', ]) +libcamera_headers = files([ + 'include/log.h', + 'include/utils.h', +]) + includes = [ libcamera_includes, include_directories('include'), ] libcamera = shared_library('camera', - sources, + libcamera_sources, install : true, include_directories : includes) |