[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] meson: Remove libpulse dep from libpulsecore

[Tanu Kaskinen]

Tanu Kaskinen pushed to branch master at PulseAudio / pulseaudio


Commits:
924743e6 by Tanu Kaskinen at 2020-04-09T14:51:21+00:00
meson: Remove libpulse dep from libpulsecore

libpulsecore is not supposed to depend on the client library.

Removing the dependency caused build failures, which are fixed by adding
more stuff to libpulsecommon.

- - - - -


2 changed files:

- src/meson.build
- src/pulsecore/meson.build


Changes:

=====================================
src/meson.build
=====================================
@@ -1,8 +1,10 @@
 libpulsecommon_sources = [
   'pulse/client-conf.c',
+  'pulse/error.c',
   'pulse/fork-detect.c',
   'pulse/format.c',
   'pulse/json.c',
+  'pulse/mainloop-api.c',
   'pulse/xmalloc.c',
   'pulse/proplist.c',
   'pulse/utf8.c',
@@ -71,9 +73,11 @@ libpulsecommon_sources = [
 
 libpulsecommon_headers = [
   'pulse/client-conf.h',
+  'pulse/error.h',
   'pulse/fork-detect.h',
   'pulse/format.h',
   'pulse/json.h',
+  'pulse/mainloop-api.h',
   'pulse/xmalloc.h',
   'pulse/proplist.h',
   'pulse/utf8.h',


=====================================
src/pulsecore/meson.build
=====================================
@@ -198,7 +198,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
   install_rpath : privlibdir,
   install_dir : privlibdir,
   link_with : libpulsecore_simd_lib,
-  dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep],
+  dependencies : [libm_dep, libpulsecommon_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep],
   implicit_include_directories : false)
 
 libpulsecore_dep = declare_dependency(link_with: libpulsecore)



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/924743e61234e6d1b8a3887b25b5186e66e10f70

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/924743e61234e6d1b8a3887b25b5186e66e10f70
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20200409/f3aeaa13/attachment.htm>