diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/journal/meson.build | 12 | ||||
| -rw-r--r-- | src/shared/meson.build | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/meson.build b/meson.build index fa0b0abf74..3e5242e09e 100644 --- a/meson.build +++ b/meson.build @@ -1254,14 +1254,14 @@ libjournal_core = static_library( libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) libsystemd = shared_library( 'systemd', - journal_internal_sources, version : libsystemd_version, include_directories : includes, link_args : ['-shared', '-Wl,--version-script=' + libsystemd_sym_path], link_with : [libbasic, libbasic_gcrypt], - link_whole : libsystemd_static, + link_whole : [libsystemd_static, + libjournal_client], dependencies : [threads, librt, libxz, diff --git a/src/journal/meson.build b/src/journal/meson.build index e4d78f330d..a23f6a712c 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -journal_internal_sources = files(''' +journal_client_sources = files(''' audit-type.c audit-type.h catalog.c @@ -38,7 +38,7 @@ journal_internal_sources = files(''' '''.split()) if conf.get('HAVE_GCRYPT') == 1 - journal_internal_sources += files(''' + journal_client_sources += files(''' journal-authenticate.c journal-authenticate.h fsprg.c @@ -69,7 +69,13 @@ audit_type_to_name = custom_target( command : [awk, '-f', '@INPUT0@', '@INPUT1@'], capture : true) -journal_internal_sources += [audit_type_to_name] +journal_client_sources += [audit_type_to_name] + +libjournal_client = static_library( + 'journal-client', + journal_client_sources, + include_directories : includes, + c_args : ['-fvisibility=default']) ############################################################ diff --git a/src/shared/meson.build b/src/shared/meson.build index 5fa863acef..290fa0524c 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -166,7 +166,6 @@ libshared_static = static_library( libshared = shared_library( libshared_name, - journal_internal_sources, libudev_sources, include_directories : includes, link_args : ['-shared', @@ -174,7 +173,8 @@ libshared = shared_library( link_whole : [libshared_static, libbasic, libbasic_gcrypt, - libsystemd_static], + libsystemd_static, + libjournal_client], c_args : ['-fvisibility=default'], dependencies : libshared_deps, install : true, |