mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-26 07:00:07 -05:00
catch up with trunk HEAD (i.e. 2118:2213)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2214 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
106ddb9211
commit
ecf6439661
24 changed files with 545 additions and 216 deletions
|
|
@ -64,7 +64,7 @@ AM_LIBADD = $(PTHREAD_LIBS)
|
|||
AM_LDADD = $(PTHREAD_LIBS)
|
||||
|
||||
# Only required on some platforms but defined for all to avoid errors
|
||||
AM_LDFLAGS = -Wl,-no-undefined -ffunction-sections -fdata-sections -Wl,--gc-sections
|
||||
AM_LDFLAGS = -Wl,-no-undefined -Wl,--gc-sections
|
||||
|
||||
if STATIC_BINS
|
||||
BINLDFLAGS = -static
|
||||
|
|
@ -103,7 +103,7 @@ EXTRA_DIST = \
|
|||
modules/module-defs.h.m4 \
|
||||
daemon/pulseaudio-module-xsmp.desktop \
|
||||
map-file \
|
||||
daemon/PulseAudio.policy
|
||||
daemon/org.pulseaudio.policy
|
||||
|
||||
pulseconf_DATA = \
|
||||
default.pa \
|
||||
|
|
@ -154,7 +154,7 @@ endif
|
|||
|
||||
if HAVE_POLKIT
|
||||
|
||||
policy_DATA = daemon/PulseAudio.policy
|
||||
policy_DATA = daemon/org.pulseaudio.policy
|
||||
|
||||
pulseaudio_SOURCES += daemon/polkit.c daemon/polkit.h
|
||||
pulseaudio_CFLAGS += $(POLKIT_CFLAGS)
|
||||
|
|
@ -202,7 +202,7 @@ pactl_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS)
|
|||
pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
|
||||
pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
pasuspender_SOURCES = utils/pasuspender.c
|
||||
pasuspender_SOURCES = utils/pasuspender.c pulsecore/core-util.c pulsecore/core-util.h pulsecore/core-error.c pulsecore/core-error.h pulsecore/log.c pulsecore/log.h pulsecore/once.c pulsecore/once.h $(PA_THREAD_OBJS)
|
||||
pasuspender_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS)
|
||||
pasuspender_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
|
||||
pasuspender_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
|
@ -275,7 +275,7 @@ mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
|||
|
||||
thread_mainloop_test_SOURCES = tests/thread-mainloop-test.c
|
||||
thread_mainloop_test_CFLAGS = $(AM_CFLAGS)
|
||||
thread_mainloop_test_LDADD = $(AM_LDADD) libpulse.la
|
||||
thread_mainloop_test_LDADD = $(AM_LDADD) libpulsecore.la libpulse.la
|
||||
thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
utf8_test_SOURCES = tests/utf8-test.c
|
||||
|
|
@ -577,7 +577,14 @@ libpulse_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
|
|||
libpulse_la_LIBADD += $(LIBASYNCNS_LIBS)
|
||||
endif
|
||||
|
||||
libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
|
||||
libpulse_simple_la_SOURCES = \
|
||||
pulse/simple.c pulse/simple.h \
|
||||
pulsecore/log.c pulsecore/log.h \
|
||||
pulsecore/core-util.c pulsecore/core-util.h \
|
||||
pulsecore/core-error.c pulsecore/core-error.h \
|
||||
pulsecore/once.c pulsecore/once.h \
|
||||
$(PA_THREAD_OBJS)
|
||||
|
||||
libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
|
||||
libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la
|
||||
libpulse_simple_la_LDFLAGS = -version-info $(LIBPULSE_SIMPLE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
|
||||
|
|
@ -587,7 +594,13 @@ libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
|
|||
libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la $(AVAHI_LIBS)
|
||||
libpulse_browse_la_LDFLAGS = -version-info $(LIBPULSE_BROWSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
|
||||
|
||||
libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
|
||||
libpulse_mainloop_glib_la_SOURCES = \
|
||||
pulse/glib-mainloop.h pulse/glib-mainloop.c \
|
||||
pulsecore/log.c pulsecore/log.h \
|
||||
pulsecore/core-util.c pulsecore/core-util.h \
|
||||
pulsecore/core-error.c pulsecore/core-error.h \
|
||||
pulsecore/once.c pulsecore/once.h \
|
||||
$(PA_THREAD_OBJS)
|
||||
libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
|
||||
libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB20_LIBS)
|
||||
libpulse_mainloop_glib_la_LDFLAGS = -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue