Changeset f2cb80a in mainline for uspace/lib/meson.build

Timestamp:

2024-02-23T17:57:23Z (3 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/lib/meson.build (modified) (2 diffs)

uspace/lib/meson.build

@@ -181 +181 @@
                 if run_command('[', '-d', incdir, ']').returncode() == 0
                         includes += include_directories(incdir)
+                        _sdir = meson.current_source_dir() / l / 'include'
 
                         if installed_libs.contains(l)
-                                _sdir = meson.current_source_dir() / l / 'include'
                                 uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
                         endif
+
+                        exported_devel_files += ['include', _sdir, 'lib' + l]
                 else
                         includes += include_directories(l)
@@ -294 +296 @@
                         install_deps += [ _static_lib ]
                 endif
+
+                exported_devel_files += ['staticlib', _static_lib, 'lib' + l + '.a']
 
                 _static_dep = declare_dependency(