From f44ba092651aa75055e109e04b4164ea92ae7fdc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Jun 2006 21:53:48 +0000 Subject: big s/polyp/pulse/g git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1033 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 796 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 398 insertions(+), 398 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 6a2decb3..746f85ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,19 @@ # $Id$ # -# This file is part of polypaudio. +# This file is part of PulseAudio. # -# polypaudio is free software; you can redistribute it and/or modify +# PulseAudio is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# polypaudio is distributed in the hope that it will be useful, but +# PulseAudio is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with polypaudio; if not, write to the Free Software +# along with PulseAudio; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. @@ -22,19 +22,19 @@ # Extra directories # ################################### -polypincludedir=$(includedir)/polyp -polypcoreincludedir=$(includedir)/polypcore -polypconfdir=$(sysconfdir)/polypaudio +pulseincludedir=$(includedir)/pulse +pulsecoreincludedir=$(includedir)/pulsecore +pulseconfdir=$(sysconfdir)/pulse ################################### # Defines # ################################### -POLYPAUDIO_BINARY=$(bindir)/polypaudio$(EXEEXT) +POLYPAUDIO_BINARY=$(bindir)/pulseaudio$(EXEEXT) if OS_IS_WIN32 DEFAULT_CONFIG_DIR=%POLYP_ROOT% else -DEFAULT_CONFIG_DIR=$(polypconfdir) +DEFAULT_CONFIG_DIR=$(pulseconfdir) endif ################################### @@ -73,7 +73,7 @@ endif ################################### EXTRA_DIST = \ - polyp/client.conf.in \ + pulse/client.conf.in \ daemon/daemon.conf.in \ daemon/default.pa.in \ depmod.py \ @@ -81,35 +81,35 @@ EXTRA_DIST = \ utils/padsp \ modules/module-defs.h.m4 -polypconf_DATA = \ +pulseconf_DATA = \ default.pa \ daemon.conf \ client.conf BUILT_SOURCES = \ - polyp/version.h + pulse/version.h ################################### # Main daemon # ################################### -bin_PROGRAMS = polypaudio +bin_PROGRAMS = pulseaudio -polypaudio_SOURCES = \ +pulseaudio_SOURCES = \ daemon/caps.h daemon/caps.c \ daemon/cmdline.c daemon/cmdline.h \ daemon/cpulimit.c daemon/cpulimit.h \ daemon/daemon-conf.c daemon/daemon-conf.h \ daemon/dumpmodules.c daemon/dumpmodules.h \ daemon/main.c \ - polypcore/gccmacro.h + pulsecore/gccmacro.h -polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) -polypaudio_CPPFLAGS = $(AM_CPPFLAGS) -polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \ +pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) +pulseaudio_CPPFLAGS = $(AM_CPPFLAGS) +pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) \ $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) # This is needed because automake doesn't properly expand the foreach below -polypaudio_DEPENDENCIES = libpolypcore.la $(PREOPEN_LIBS) +pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS) if PREOPEN_MODS PREOPEN_LIBS = $(PREOPEN_MODS) @@ -118,9 +118,9 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES) endif if FORCE_PREOPEN -polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f)) +pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f)) else -polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f)) +pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f)) endif ################################### @@ -147,32 +147,32 @@ endif bin_SCRIPTS = esdcompat pacat_SOURCES = utils/pacat.c -pacat_LDADD = $(AM_LDADD) libpolyp.la +pacat_LDADD = $(AM_LDADD) libpulse.la pacat_CFLAGS = $(AM_CFLAGS) pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) paplay_SOURCES = utils/paplay.c -paplay_LDADD = $(AM_LDADD) libpolyp.la $(LIBSNDFILE_LIBS) +paplay_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS) paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pactl_SOURCES = utils/pactl.c -pactl_LDADD = $(AM_LDADD) libpolyp.la $(LIBSNDFILE_LIBS) +pactl_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS) pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -pacmd_SOURCES = utils/pacmd.c polypcore/pid.c polypcore/pid.h +pacmd_SOURCES = utils/pacmd.c pulsecore/pid.c pulsecore/pid.h pacmd_CFLAGS = $(AM_CFLAGS) -pacmd_LDADD = $(AM_LDADD) libpolyp.la +pacmd_LDADD = $(AM_LDADD) libpulse.la pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pax11publish_SOURCES = utils/pax11publish.c pax11publish_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -pax11publish_LDADD = $(AM_LDADD) libpolyp.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) +pax11publish_LDADD = $(AM_LDADD) libpulse.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pabrowse_SOURCES = utils/pabrowse.c -pabrowse_LDADD = $(AM_LDADD) libpolyp.la libpolyp-browse.la +pabrowse_LDADD = $(AM_LDADD) libpulse.la libpulse-browse.la pabrowse_CFLAGS = $(AM_CFLAGS) pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) @@ -212,81 +212,81 @@ endif mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_CFLAGS = $(AM_CFLAGS) -mainloop_test_LDADD = $(AM_LDADD) libpolyp.la +mainloop_test_LDADD = $(AM_LDADD) libpulse.la 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) libpolyp.la +thread_mainloop_test_LDADD = $(AM_LDADD) libpulse.la thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) utf8_test_SOURCES = tests/utf8-test.c utf8_test_CFLAGS = $(AM_CFLAGS) -utf8_test_LDADD = $(AM_LDADD) libpolypcore.la +utf8_test_LDADD = $(AM_LDADD) libpulsecore.la utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) mcalign_test_SOURCES = tests/mcalign-test.c mcalign_test_CFLAGS = $(AM_CFLAGS) -mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la +mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) pacat_simple_SOURCES = tests/pacat-simple.c -pacat_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la +pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la pacat_simple_CFLAGS = $(AM_CFLAGS) pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) parec_simple_SOURCES = tests/parec-simple.c -parec_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la +parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la parec_simple_CFLAGS = $(AM_CFLAGS) parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) strlist_test_SOURCES = tests/strlist-test.c strlist_test_CFLAGS = $(AM_CFLAGS) -strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la libstrlist.la +strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la libstrlist.la strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) voltest_SOURCES = tests/voltest.c voltest_CFLAGS = $(AM_CFLAGS) -voltest_LDADD = $(AM_LDADD) libpolyp.la +voltest_LDADD = $(AM_LDADD) libpulse.la voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) channelmap_test_SOURCES = tests/channelmap-test.c channelmap_test_CFLAGS = $(AM_CFLAGS) -channelmap_test_LDADD = $(AM_LDADD) libpolyp.la +channelmap_test_LDADD = $(AM_LDADD) libpulse.la channelmap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h cpulimit_test_CFLAGS = $(AM_CFLAGS) -cpulimit_test_LDADD = $(AM_LDADD) libpolypcore.la +cpulimit_test_LDADD = $(AM_LDADD) libpulsecore.la cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2 -cpulimit_test2_LDADD = $(AM_LDADD) libpolypcore.la +cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore.la cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES) mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP -mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpolyp-mainloop-glib.la +mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpulse-mainloop-glib.la mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES) mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP -mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la +mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpulse-mainloop-glib12.la mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) memblockq_test_SOURCES = tests/memblockq-test.c memblockq_test_CFLAGS = $(AM_CFLAGS) -memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la +memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) sync_playback_SOURCES = tests/sync-playback.c -sync_playback_LDADD = $(AM_LDADD) libpolyp.la +sync_playback_LDADD = $(AM_LDADD) libpulse.la sync_playback_CFLAGS = $(AM_CFLAGS) sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) interpol_test_SOURCES = tests/interpol-test.c -interpol_test_LDADD = $(AM_LDADD) libpolyp.la +interpol_test_LDADD = $(AM_LDADD) libpulse.la interpol_test_CFLAGS = $(AM_CFLAGS) interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) @@ -294,170 +294,170 @@ interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) # Client library # ################################### -polypinclude_HEADERS = \ - polyp/cdecl.h \ - polyp/channelmap.h \ - polyp/context.h \ - polyp/def.h \ - polyp/error.h \ - polyp/introspect.h \ - polyp/mainloop.h \ - polyp/mainloop-api.h \ - polyp/mainloop-signal.h \ - polyp/operation.h \ - polyp/polypaudio.h \ - polyp/sample.h \ - polyp/scache.h \ - polyp/simple.h \ - polyp/stream.h \ - polyp/subscribe.h \ - polyp/thread-mainloop.h \ - polyp/timeval.h \ - polyp/utf8.h \ - polyp/util.h \ - polyp/version.h \ - polyp/volume.h \ - polyp/xmalloc.h +pulseinclude_HEADERS = \ + pulse/cdecl.h \ + pulse/channelmap.h \ + pulse/context.h \ + pulse/def.h \ + pulse/error.h \ + pulse/introspect.h \ + pulse/mainloop.h \ + pulse/mainloop-api.h \ + pulse/mainloop-signal.h \ + pulse/operation.h \ + pulse/pulseaudio.h \ + pulse/sample.h \ + pulse/scache.h \ + pulse/simple.h \ + pulse/stream.h \ + pulse/subscribe.h \ + pulse/thread-mainloop.h \ + pulse/timeval.h \ + pulse/utf8.h \ + pulse/util.h \ + pulse/version.h \ + pulse/volume.h \ + pulse/xmalloc.h if HAVE_HOWL -polypinclude_HEADERS += \ - polyp/browser.h +pulseinclude_HEADERS += \ + pulse/browser.h endif if HAVE_GLIB20 -polypinclude_HEADERS += \ - polyp/glib-mainloop.h +pulseinclude_HEADERS += \ + pulse/glib-mainloop.h else if HAVE_GLIB12 -polypinclude_HEADERS += \ - polyp/glib-mainloop.h +pulseinclude_HEADERS += \ + pulse/glib-mainloop.h endif endif lib_LTLIBRARIES = \ - libpolyp.la \ - libpolyp-simple.la + libpulse.la \ + libpulse-simple.la if HAVE_HOWL lib_LTLIBRARIES += \ - libpolyp-browse.la + libpulse-browse.la endif if HAVE_GLIB20 lib_LTLIBRARIES += \ - libpolyp-mainloop-glib.la + libpulse-mainloop-glib.la endif if HAVE_GLIB12 lib_LTLIBRARIES += \ - libpolyp-mainloop-glib12.la + libpulse-mainloop-glib12.la endif # Public interface -libpolyp_la_SOURCES = \ - polyp/cdecl.h \ - polyp/channelmap.c polyp/channelmap.h \ - polyp/client-conf.c polyp/client-conf.h \ - polyp/context.c polyp/context.h \ - polyp/def.h \ - polyp/error.c polyp/error.h \ - polyp/internal.h \ - polyp/introspect.c polyp/introspect.h \ - polyp/mainloop.c polyp/mainloop.h \ - polyp/mainloop-api.c polyp/mainloop-api.h \ - polyp/mainloop-signal.c polyp/mainloop-signal.h \ - polyp/operation.c polyp/operation.h \ - polyp/polypaudio.h \ - polyp/sample.c polyp/sample.h \ - polyp/scache.c polyp/scache.h \ - polyp/stream.c polyp/stream.h \ - polyp/subscribe.c polyp/subscribe.h \ - polyp/thread-mainloop.c polyp/thread-mainloop.h \ - polyp/timeval.c polyp/timeval.h \ - polyp/utf8.c polyp/utf8.h \ - polyp/util.c polyp/util.h \ - polyp/volume.c polyp/volume.h \ - polyp/xmalloc.c polyp/xmalloc.h - -# Internal stuff that is shared with libpolypcore -libpolyp_la_SOURCES += \ - polypcore/authkey.c polypcore/authkey.h \ - polypcore/conf-parser.c polypcore/conf-parser.h \ - polypcore/core-util.c polypcore/core-util.h \ - polypcore/dynarray.c polypcore/dynarray.h \ - polypcore/gccmacro.h \ - polypcore/hashmap.c polypcore/hashmap.h \ - polypcore/idxset.c polypcore/idxset.h \ - polypcore/inet_ntop.c polypcore/inet_ntop.h \ - polypcore/iochannel.c polypcore/iochannel.h \ - polypcore/llist.h \ - polypcore/log.c polypcore/log.h \ - polypcore/mcalign.c polypcore/mcalign.h \ - polypcore/memblock.c polypcore/memblock.h \ - polypcore/memblockq.c polypcore/memblockq.h \ - polypcore/memchunk.c polypcore/memchunk.h \ - polypcore/native-common.h \ - polypcore/packet.c polypcore/packet.h \ - polypcore/parseaddr.c polypcore/parseaddr.h \ - polypcore/pdispatch.c polypcore/pdispatch.h \ - polypcore/pipe.c polypcore/pipe.h \ - polypcore/poll.c polypcore/poll.h \ - polypcore/pstream.c polypcore/pstream.h \ - polypcore/pstream-util.c polypcore/pstream-util.h \ - polypcore/queue.c polypcore/queue.h \ - polypcore/random.c polypcore/random.h \ - polypcore/socket-client.c polypcore/socket-client.h \ - polypcore/socket-util.c polypcore/socket-util.h \ - polypcore/strbuf.c polypcore/strbuf.h \ - polypcore/strlist.c polypcore/strlist.h \ - polypcore/tagstruct.c polypcore/tagstruct.h \ - polypcore/core-error.c polypcore/core-error.h \ - polypcore/winsock.h +libpulse_la_SOURCES = \ + pulse/cdecl.h \ + pulse/channelmap.c pulse/channelmap.h \ + pulse/client-conf.c pulse/client-conf.h \ + pulse/context.c pulse/context.h \ + pulse/def.h \ + pulse/error.c pulse/error.h \ + pulse/internal.h \ + pulse/introspect.c pulse/introspect.h \ + pulse/mainloop.c pulse/mainloop.h \ + pulse/mainloop-api.c pulse/mainloop-api.h \ + pulse/mainloop-signal.c pulse/mainloop-signal.h \ + pulse/operation.c pulse/operation.h \ + pulse/pulseaudio.h \ + pulse/sample.c pulse/sample.h \ + pulse/scache.c pulse/scache.h \ + pulse/stream.c pulse/stream.h \ + pulse/subscribe.c pulse/subscribe.h \ + pulse/thread-mainloop.c pulse/thread-mainloop.h \ + pulse/timeval.c pulse/timeval.h \ + pulse/utf8.c pulse/utf8.h \ + pulse/util.c pulse/util.h \ + pulse/volume.c pulse/volume.h \ + pulse/xmalloc.c pulse/xmalloc.h + +# Internal stuff that is shared with libpulsecore +libpulse_la_SOURCES += \ + pulsecore/authkey.c pulsecore/authkey.h \ + pulsecore/conf-parser.c pulsecore/conf-parser.h \ + pulsecore/core-util.c pulsecore/core-util.h \ + pulsecore/dynarray.c pulsecore/dynarray.h \ + pulsecore/gccmacro.h \ + pulsecore/hashmap.c pulsecore/hashmap.h \ + pulsecore/idxset.c pulsecore/idxset.h \ + pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ + pulsecore/iochannel.c pulsecore/iochannel.h \ + pulsecore/llist.h \ + pulsecore/log.c pulsecore/log.h \ + pulsecore/mcalign.c pulsecore/mcalign.h \ + pulsecore/memblock.c pulsecore/memblock.h \ + pulsecore/memblockq.c pulsecore/memblockq.h \ + pulsecore/memchunk.c pulsecore/memchunk.h \ + pulsecore/native-common.h \ + pulsecore/packet.c pulsecore/packet.h \ + pulsecore/parseaddr.c pulsecore/parseaddr.h \ + pulsecore/pdispatch.c pulsecore/pdispatch.h \ + pulsecore/pipe.c pulsecore/pipe.h \ + pulsecore/poll.c pulsecore/poll.h \ + pulsecore/pstream.c pulsecore/pstream.h \ + pulsecore/pstream-util.c pulsecore/pstream-util.h \ + pulsecore/queue.c pulsecore/queue.h \ + pulsecore/random.c pulsecore/random.h \ + pulsecore/socket-client.c pulsecore/socket-client.h \ + pulsecore/socket-util.c pulsecore/socket-util.h \ + pulsecore/strbuf.c pulsecore/strbuf.h \ + pulsecore/strlist.c pulsecore/strlist.h \ + pulsecore/tagstruct.c pulsecore/tagstruct.h \ + pulsecore/core-error.c pulsecore/core-error.h \ + pulsecore/winsock.h if OS_IS_WIN32 -libpolyp_la_SOURCES += \ - polypcore/dllmain.c +libpulse_la_SOURCES += \ + pulsecore/dllmain.c endif if HAVE_X11 -libpolyp_la_SOURCES += \ - polyp/client-conf-x11.c polyp/client-conf-x11.h \ - polypcore/x11prop.c polypcore/x11prop.h +libpulse_la_SOURCES += \ + pulse/client-conf-x11.c pulse/client-conf-x11.h \ + pulsecore/x11prop.c pulsecore/x11prop.h endif -libpolyp_la_CFLAGS = $(AM_CFLAGS) -libpolyp_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO) -libpolyp_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV) +libpulse_la_CFLAGS = $(AM_CFLAGS) +libpulse_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO) +libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV) if HAVE_X11 -libpolyp_la_CFLAGS += $(X_CFLAGS) -libpolyp_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) +libpulse_la_CFLAGS += $(X_CFLAGS) +libpulse_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) endif if HAVE_LIBASYNCNS -libpolyp_la_CFLAGS += $(LIBASYNCNS_CFLAGS) -libpolyp_la_LIBADD += $(LIBASYNCNS_LIBS) +libpulse_la_CFLAGS += $(LIBASYNCNS_CFLAGS) +libpulse_la_LIBADD += $(LIBASYNCNS_LIBS) endif -libpolyp_simple_la_SOURCES = polyp/simple.c polyp/simple.h -libpolyp_simple_la_CFLAGS = $(AM_CFLAGS) -libpolyp_simple_la_LIBADD = $(AM_LIBADD) libpolyp.la -libpolyp_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO) +libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h +libpulse_simple_la_CFLAGS = $(AM_CFLAGS) +libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la +libpulse_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO) -libpolyp_browse_la_SOURCES = polyp/browser.c polyp/browser.h -libpolyp_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS) -libpolyp_browse_la_LIBADD = $(AM_LIBADD) libpolyp.la $(HOWL_LIBS) -libpolyp_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO) +libpulse_browse_la_SOURCES = pulse/browser.c pulse/browser.h +libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS) +libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la $(HOWL_LIBS) +libpulse_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO) -libpolyp_mainloop_glib_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c -libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) -libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB20_LIBS) -libpolyp_mainloop_glib_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO) +libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c +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 $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO) -libpolyp_mainloop_glib12_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c -libpolyp_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS) -libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB12_LIBS) -libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO) +libpulse_mainloop_glib12_la_SOURCES = pulse/glib-mainloop.h pulse/glib12-mainloop.c +libpulse_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS) +libpulse_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB12_LIBS) +libpulse_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO) ################################### # OSS emulation # @@ -465,164 +465,164 @@ libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VER if HAVE_OSS -lib_LTLIBRARIES += libpolypdsp.la +lib_LTLIBRARIES += libpulsedsp.la bin_SCRIPTS += utils/padsp endif -libpolypdsp_la_SOURCES = utils/padsp.c -libpolypdsp_la_CFLAGS = $(AM_CFLAGS) -libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la -libpolypdsp_la_LDFLAGS = -avoid-version +libpulsedsp_la_SOURCES = utils/padsp.c +libpulsedsp_la_CFLAGS = $(AM_CFLAGS) +libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la +libpulsedsp_la_LDFLAGS = -avoid-version ################################### # Daemon core library # ################################### -polypcoreinclude_HEADERS = \ - polypcore/autoload.h \ - polypcore/cli-command.h \ - polypcore/cli-text.h \ - polypcore/client.h \ - polypcore/core.h \ - polypcore/core-def.h \ - polypcore/core-scache.h \ - polypcore/core-subscribe.h \ - polypcore/conf-parser.h \ - polypcore/core-util.h \ - polypcore/dynarray.h \ - polypcore/g711.h \ - polypcore/hashmap.h \ - polypcore/idxset.h \ - polypcore/log.h \ - polypcore/mcalign.h \ - polypcore/memblock.h \ - polypcore/memblockq.h \ - polypcore/memchunk.h \ - polypcore/modargs.h \ - polypcore/modinfo.h \ - polypcore/module.h \ - polypcore/namereg.h \ - polypcore/pid.h \ - polypcore/play-memchunk.h \ - polypcore/props.h \ - polypcore/queue.h \ - polypcore/random.h \ - polypcore/resampler.h \ - polypcore/sample-util.h \ - polypcore/sconv.h \ - polypcore/sink.h \ - polypcore/sink-input.h \ - polypcore/sioman.h \ - polypcore/sound-file.h \ - polypcore/sound-file-stream.h \ - polypcore/source.h \ - polypcore/source-output.h \ - polypcore/strbuf.h \ - polypcore/tokenizer.h - -lib_LTLIBRARIES += libpolypcore.la +pulsecoreinclude_HEADERS = \ + pulsecore/autoload.h \ + pulsecore/cli-command.h \ + pulsecore/cli-text.h \ + pulsecore/client.h \ + pulsecore/core.h \ + pulsecore/core-def.h \ + pulsecore/core-scache.h \ + pulsecore/core-subscribe.h \ + pulsecore/conf-parser.h \ + pulsecore/core-util.h \ + pulsecore/dynarray.h \ + pulsecore/g711.h \ + pulsecore/hashmap.h \ + pulsecore/idxset.h \ + pulsecore/log.h \ + pulsecore/mcalign.h \ + pulsecore/memblock.h \ + pulsecore/memblockq.h \ + pulsecore/memchunk.h \ + pulsecore/modargs.h \ + pulsecore/modinfo.h \ + pulsecore/module.h \ + pulsecore/namereg.h \ + pulsecore/pid.h \ + pulsecore/play-memchunk.h \ + pulsecore/props.h \ + pulsecore/queue.h \ + pulsecore/random.h \ + pulsecore/resampler.h \ + pulsecore/sample-util.h \ + pulsecore/sconv.h \ + pulsecore/sink.h \ + pulsecore/sink-input.h \ + pulsecore/sioman.h \ + pulsecore/sound-file.h \ + pulsecore/sound-file-stream.h \ + pulsecore/source.h \ + pulsecore/source-output.h \ + pulsecore/strbuf.h \ + pulsecore/tokenizer.h + +lib_LTLIBRARIES += libpulsecore.la # Some public stuff is used even in the core. -libpolypcore_la_SOURCES = \ - polyp/channelmap.c polyp/channelmap.h \ - polyp/error.c polyp/error.h \ - polyp/mainloop.c polyp/mainloop.h \ - polyp/mainloop-api.c polyp/mainloop-api.h \ - polyp/mainloop-signal.c polyp/mainloop-signal.h \ - polyp/sample.c polyp/sample.h \ - polyp/timeval.c polyp/timeval.h \ - polyp/utf8.c polyp/utf8.h \ - polyp/util.c polyp/util.h \ - polyp/volume.c polyp/volume.h \ - polyp/xmalloc.c polyp/xmalloc.h - -# Pure core stuff (some are shared in libpolyp though). -libpolypcore_la_SOURCES += \ - polypcore/autoload.c polypcore/autoload.h \ - polypcore/cli-command.c polypcore/cli-command.h \ - polypcore/cli-text.c polypcore/cli-text.h \ - polypcore/client.c polypcore/client.h \ - polypcore/conf-parser.c polypcore/conf-parser.h \ - polypcore/core.c polypcore/core.h \ - polypcore/core-scache.c polypcore/core-scache.h \ - polypcore/core-subscribe.c polypcore/core-subscribe.h \ - polypcore/core-util.c polypcore/core-util.h \ - polypcore/dynarray.c polypcore/dynarray.h \ - polypcore/endianmacros.h \ - polypcore/g711.c polypcore/g711.h \ - polypcore/hashmap.c polypcore/hashmap.h \ - polypcore/idxset.c polypcore/idxset.h \ - polypcore/log.c polypcore/log.h \ - polypcore/mcalign.c polypcore/mcalign.h \ - polypcore/memblock.c polypcore/memblock.h \ - polypcore/memblockq.c polypcore/memblockq.h \ - polypcore/memchunk.c polypcore/memchunk.h \ - polypcore/modargs.c polypcore/modargs.h \ - polypcore/modinfo.c polypcore/modinfo.h \ - polypcore/module.c polypcore/module.h \ - polypcore/namereg.c polypcore/namereg.h \ - polypcore/pid.c polypcore/pid.h \ - polypcore/pipe.c polypcore/pipe.h \ - polypcore/play-memchunk.c polypcore/play-memchunk.h \ - polypcore/poll.c polypcore/poll.h \ - polypcore/props.c polypcore/props.h \ - polypcore/queue.c polypcore/queue.h \ - polypcore/random.c polypcore/random.h \ - polypcore/resampler.c polypcore/resampler.h \ - polypcore/sample-util.c polypcore/sample-util.h \ - polypcore/sconv.c polypcore/sconv.h \ - polypcore/sconv-s16be.c polypcore/sconv-s16be.h \ - polypcore/sconv-s16le.c polypcore/sconv-s16le.h \ - polypcore/sink.c polypcore/sink.h \ - polypcore/sink-input.c polypcore/sink-input.h \ - polypcore/sioman.c polypcore/sioman.h \ - polypcore/sound-file.c polypcore/sound-file.h \ - polypcore/sound-file-stream.c polypcore/sound-file-stream.h \ - polypcore/source.c polypcore/source.h \ - polypcore/source-output.c polypcore/source-output.h \ - polypcore/strbuf.c polypcore/strbuf.h \ - polypcore/tokenizer.c polypcore/tokenizer.h \ - polypcore/winsock.h \ - polypcore/core-error.c polypcore/core-error.h +libpulsecore_la_SOURCES = \ + pulse/channelmap.c pulse/channelmap.h \ + pulse/error.c pulse/error.h \ + pulse/mainloop.c pulse/mainloop.h \ + pulse/mainloop-api.c pulse/mainloop-api.h \ + pulse/mainloop-signal.c pulse/mainloop-signal.h \ + pulse/sample.c pulse/sample.h \ + pulse/timeval.c pulse/timeval.h \ + pulse/utf8.c pulse/utf8.h \ + pulse/util.c pulse/util.h \ + pulse/volume.c pulse/volume.h \ + pulse/xmalloc.c pulse/xmalloc.h + +# Pure core stuff (some are shared in libpulse though). +libpulsecore_la_SOURCES += \ + pulsecore/autoload.c pulsecore/autoload.h \ + pulsecore/cli-command.c pulsecore/cli-command.h \ + pulsecore/cli-text.c pulsecore/cli-text.h \ + pulsecore/client.c pulsecore/client.h \ + pulsecore/conf-parser.c pulsecore/conf-parser.h \ + pulsecore/core.c pulsecore/core.h \ + pulsecore/core-scache.c pulsecore/core-scache.h \ + pulsecore/core-subscribe.c pulsecore/core-subscribe.h \ + pulsecore/core-util.c pulsecore/core-util.h \ + pulsecore/dynarray.c pulsecore/dynarray.h \ + pulsecore/endianmacros.h \ + pulsecore/g711.c pulsecore/g711.h \ + pulsecore/hashmap.c pulsecore/hashmap.h \ + pulsecore/idxset.c pulsecore/idxset.h \ + pulsecore/log.c pulsecore/log.h \ + pulsecore/mcalign.c pulsecore/mcalign.h \ + pulsecore/memblock.c pulsecore/memblock.h \ + pulsecore/memblockq.c pulsecore/memblockq.h \ + pulsecore/memchunk.c pulsecore/memchunk.h \ + pulsecore/modargs.c pulsecore/modargs.h \ + pulsecore/modinfo.c pulsecore/modinfo.h \ + pulsecore/module.c pulsecore/module.h \ + pulsecore/namereg.c pulsecore/namereg.h \ + pulsecore/pid.c pulsecore/pid.h \ + pulsecore/pipe.c pulsecore/pipe.h \ + pulsecore/play-memchunk.c pulsecore/play-memchunk.h \ + pulsecore/poll.c pulsecore/poll.h \ + pulsecore/props.c pulsecore/props.h \ + pulsecore/queue.c pulsecore/queue.h \ + pulsecore/random.c pulsecore/random.h \ + pulsecore/resampler.c pulsecore/resampler.h \ + pulsecore/sample-util.c pulsecore/sample-util.h \ + pulsecore/sconv.c pulsecore/sconv.h \ + pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \ + pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \ + pulsecore/sink.c pulsecore/sink.h \ + pulsecore/sink-input.c pulsecore/sink-input.h \ + pulsecore/sioman.c pulsecore/sioman.h \ + pulsecore/sound-file.c pulsecore/sound-file.h \ + pulsecore/sound-file-stream.c pulsecore/sound-file-stream.h \ + pulsecore/source.c pulsecore/source.h \ + pulsecore/source-output.c pulsecore/source-output.h \ + pulsecore/strbuf.c pulsecore/strbuf.h \ + pulsecore/tokenizer.c pulsecore/tokenizer.h \ + pulsecore/winsock.h \ + pulsecore/core-error.c pulsecore/core-error.h if OS_IS_WIN32 -libpolypcore_la_SOURCES += \ - polypcore/dllmain.c +libpulsecore_la_SOURCES += \ + pulsecore/dllmain.c endif -libpolypcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS) -libpolypcore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO) -libpolypcore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) +libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS) +libpulsecore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO) +libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) ################################### # Plug-in support libraries # ################################### -polypcoreinclude_HEADERS += \ - polypcore/socket-util.h \ - polypcore/iochannel.h \ - polypcore/socket-server.h \ - polypcore/socket-client.h \ - polypcore/parseaddr.h \ - polypcore/packet.h \ - polypcore/pstream.h \ - polypcore/ioline.h \ - polypcore/cli.h \ - polypcore/protocol-cli.h \ - polypcore/tagstruct.h \ - polypcore/pstream-util.h \ - polypcore/pdispatch.h \ - polypcore/authkey.h \ - polypcore/authkey-prop.h \ - polypcore/strlist.h \ - polypcore/protocol-simple.h \ - polypcore/esound.h \ - polypcore/protocol-esound.h \ - polypcore/native-common.h \ - polypcore/protocol-native.h \ - polypcore/protocol-http.h +pulsecoreinclude_HEADERS += \ + pulsecore/socket-util.h \ + pulsecore/iochannel.h \ + pulsecore/socket-server.h \ + pulsecore/socket-client.h \ + pulsecore/parseaddr.h \ + pulsecore/packet.h \ + pulsecore/pstream.h \ + pulsecore/ioline.h \ + pulsecore/cli.h \ + pulsecore/protocol-cli.h \ + pulsecore/tagstruct.h \ + pulsecore/pstream-util.h \ + pulsecore/pdispatch.h \ + pulsecore/authkey.h \ + pulsecore/authkey-prop.h \ + pulsecore/strlist.h \ + pulsecore/protocol-simple.h \ + pulsecore/esound.h \ + pulsecore/protocol-esound.h \ + pulsecore/native-common.h \ + pulsecore/protocol-native.h \ + pulsecore/protocol-http.h ### Warning! Due to an obscure bug in libtool/automake it is required ### that the libraries in modlibexec_LTLIBRARIES are specified in-order, @@ -658,114 +658,114 @@ modlibexec_LTLIBRARIES += \ endif if HAVE_X11 -polypcoreinclude_HEADERS += \ - polypcore/x11wrap.h \ - polypcore/x11prop.h +pulsecoreinclude_HEADERS += \ + pulsecore/x11wrap.h \ + pulsecore/x11prop.h modlibexec_LTLIBRARIES += \ libx11wrap.la \ libx11prop.la endif -libprotocol_simple_la_SOURCES = polypcore/protocol-simple.c polypcore/protocol-simple.h +libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h libprotocol_simple_la_LDFLAGS = -avoid-version -libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-server.la libiochannel.la +libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-server.la libiochannel.la libsocket_server_la_SOURCES = \ - polypcore/inet_ntop.c polypcore/inet_ntop.h \ - polypcore/inet_pton.c polypcore/inet_pton.h \ - polypcore/socket-server.c polypcore/socket-server.h + pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ + pulsecore/inet_pton.c pulsecore/inet_pton.h \ + pulsecore/socket-server.c pulsecore/socket-server.h libsocket_server_la_LDFLAGS = -avoid-version -libsocket_server_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS) +libsocket_server_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS) -libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/socket-client.h +libsocket_client_la_SOURCES = pulsecore/socket-client.c pulsecore/socket-client.h libsocket_client_la_LDFLAGS = -avoid-version -libsocket_client_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS) +libsocket_client_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS) libsocket_client_la_CFLAGS = $(AM_CFLAGS) $(LIBASYNCNS_CFLAGS) -libparseaddr_la_SOURCES = polypcore/parseaddr.c polypcore/parseaddr.h +libparseaddr_la_SOURCES = pulsecore/parseaddr.c pulsecore/parseaddr.h libparseaddr_la_LDFLAGS = -avoid-version -libparseaddr_la_LIBADD = $(AM_LIBADD) libpolypcore.la +libparseaddr_la_LIBADD = $(AM_LIBADD) libpulsecore.la -libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h +libpstream_la_SOURCES = pulsecore/pstream.c pulsecore/pstream.h libpstream_la_LDFLAGS = -avoid-version -libpstream_la_LIBADD = $(AM_LIBADD) libpolypcore.la libpacket.la libiochannel.la $(WINSOCK_LIBS) +libpstream_la_LIBADD = $(AM_LIBADD) libpulsecore.la libpacket.la libiochannel.la $(WINSOCK_LIBS) -libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h +libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h libpstream_util_la_LDFLAGS = -avoid-version libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la -libpdispatch_la_SOURCES = polypcore/pdispatch.c polypcore/pdispatch.h +libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h libpdispatch_la_LDFLAGS = -avoid-version -libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpolypcore.la +libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpulsecore.la -libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h +libiochannel_la_SOURCES = pulsecore/iochannel.c pulsecore/iochannel.h libiochannel_la_LDFLAGS = -avoid-version -libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpolypcore.la $(WINSOCK_LIBS) +libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpulsecore.la $(WINSOCK_LIBS) -libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h +libpacket_la_SOURCES = pulsecore/packet.c pulsecore/packet.h libpacket_la_LDFLAGS = -avoid-version -libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la +libpacket_la_LIBADD = $(AM_LIBADD) libpulsecore.la -libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h +libioline_la_SOURCES = pulsecore/ioline.c pulsecore/ioline.h libioline_la_LDFLAGS = -avoid-version -libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la +libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpulsecore.la -libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h +libcli_la_SOURCES = pulsecore/cli.c pulsecore/cli.h libcli_la_CPPFLAGS = $(AM_CPPFLAGS) libcli_la_LDFLAGS = -avoid-version -libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpolypcore.la +libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpulsecore.la -libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h +libstrlist_la_SOURCES = pulsecore/strlist.c pulsecore/strlist.h libstrlist_la_LDFLAGS = -avoid-version -libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la +libstrlist_la_LIBADD = $(AM_LIBADD) libpulsecore.la -libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/protocol-cli.h +libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h libprotocol_cli_la_LDFLAGS = -avoid-version -libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpolypcore.la +libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpulsecore.la -libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/protocol-http.h +libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h libprotocol_http_la_LDFLAGS = -avoid-version -libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpolypcore.la libiochannel.la +libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpulsecore.la libiochannel.la -libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/native-common.h +libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h libprotocol_native_la_LDFLAGS = -avoid-version -libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpolypcore.la libiochannel.la +libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpulsecore.la libiochannel.la -libtagstruct_la_SOURCES = polypcore/tagstruct.c polypcore/tagstruct.h +libtagstruct_la_SOURCES = pulsecore/tagstruct.c pulsecore/tagstruct.h libtagstruct_la_LDFLAGS = -avoid-version -libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS) +libtagstruct_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS) -libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h +libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h libprotocol_esound_la_LDFLAGS = -avoid-version -libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpolypcore.la +libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpulsecore.la -libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h +libauthkey_la_SOURCES = pulsecore/authkey.c pulsecore/authkey.h libauthkey_la_LDFLAGS = -avoid-version -libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la +libauthkey_la_LIBADD = $(AM_LIBADD) libpulsecore.la -libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h +libauthkey_prop_la_SOURCES = pulsecore/authkey-prop.c pulsecore/authkey-prop.h libauthkey_prop_la_LDFLAGS = -avoid-version -libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpolypcore.la +libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket_util_la_SOURCES = \ - polypcore/inet_ntop.c polypcor/inet_ntop.h \ - polypcore/socket-util.c polypcore/socket-util.h + pulsecore/inet_ntop.c pulsecor/inet_ntop.h \ + pulsecore/socket-util.c pulsecore/socket-util.h libsocket_util_la_LDFLAGS = -avoid-version -libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpolypcore.la +libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpulsecore.la librtp_la_SOURCES = modules/rtp/rtp.c modules/rtp/rtp.h modules/rtp/sdp.c modules/rtp/sdp.h modules/rtp/sap.c modules/rtp/sap.h librtp_la_LDFLAGS = -avoid-version -librtp_la_LIBADD = $(AM_LIBADD) libpolypcore.la +librtp_la_LIBADD = $(AM_LIBADD) libpulsecore.la # X11 -libx11wrap_la_SOURCES = polypcore/x11wrap.c polypcore/x11wrap.h +libx11wrap_la_SOURCES = pulsecore/x11wrap.c pulsecore/x11wrap.h libx11wrap_la_LDFLAGS = -avoid-version libx11wrap_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpolypcore.la +libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpulsecore.la -libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/x11prop.h +libx11prop_la_SOURCES = pulsecore/x11prop.c pulsecore/x11prop.h libx11prop_la_LDFLAGS = -avoid-version libx11prop_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) @@ -932,127 +932,127 @@ $(SYMDEF_FILES): modules/module-defs.h.m4 module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS) module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version -module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la +module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-simple.la libsocket-server.la module_simple_protocol_unix_la_SOURCES = modules/module-protocol-stub.c module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS) module_simple_protocol_unix_la_LDFLAGS = -module -avoid-version -module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la libsocket-util.la +module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-simple.la libsocket-server.la libsocket-util.la # CLI protocol module_cli_la_SOURCES = modules/module-cli.c module_cli_la_LDFLAGS = -module -avoid-version -module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpolypcore.la +module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpulsecore.la module_cli_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS) module_cli_protocol_tcp_la_LDFLAGS = -module -avoid-version -module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la +module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-cli.la libsocket-server.la module_cli_protocol_unix_la_SOURCES = modules/module-protocol-stub.c module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS) module_cli_protocol_unix_la_LDFLAGS = -module -avoid-version -module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la libsocket-util.la +module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-cli.la libsocket-server.la libsocket-util.la # HTTP protocol module_http_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS) module_http_protocol_tcp_la_LDFLAGS = -module -avoid-version -module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la +module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-http.la libsocket-server.la module_http_protocol_unix_la_SOURCES = modules/module-protocol-stub.c module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS) module_http_protocol_unix_la_LDFLAGS = -module -avoid-version -module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la libsocket-util.la +module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-http.la libsocket-server.la libsocket-util.la # Native protocol module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS) module_native_protocol_tcp_la_LDFLAGS = -module -avoid-version -module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la +module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la module_native_protocol_unix_la_SOURCES = modules/module-protocol-stub.c module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS) module_native_protocol_unix_la_LDFLAGS = -module -avoid-version -module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la +module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la libsocket-util.la module_native_protocol_fd_la_SOURCES = modules/module-native-protocol-fd.c module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS) module_native_protocol_fd_la_LDFLAGS = -module -avoid-version -module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la +module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la # EsounD protocol module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS) module_esound_protocol_tcp_la_LDFLAGS = -module -avoid-version -module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la +module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-esound.la libsocket-server.la module_esound_protocol_unix_la_SOURCES = modules/module-protocol-stub.c module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS) module_esound_protocol_unix_la_LDFLAGS = -module -avoid-version -module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la libsocket-util.la +module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-esound.la libsocket-server.la libsocket-util.la module_esound_compat_spawnfd_la_SOURCES = modules/module-esound-compat-spawnfd.c module_esound_compat_spawnfd_la_LDFLAGS = -module -avoid-version -module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_esound_compat_spawnpid_la_SOURCES = modules/module-esound-compat-spawnpid.c module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version -module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_esound_sink_la_SOURCES = modules/module-esound-sink.c module_esound_sink_la_LDFLAGS = -module -avoid-version -module_esound_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-client.la libauthkey.la +module_esound_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-client.la libauthkey.la # Pipes module_pipe_sink_la_SOURCES = modules/module-pipe-sink.c module_pipe_sink_la_LDFLAGS = -module -avoid-version -module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la +module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la module_pipe_source_la_SOURCES = modules/module-pipe-source.c module_pipe_source_la_LDFLAGS = -module -avoid-version -module_pipe_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la +module_pipe_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la # Fake sources/sinks module_sine_la_SOURCES = modules/module-sine.c module_sine_la_LDFLAGS = -module -avoid-version -module_sine_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_sine_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_null_sink_la_SOURCES = modules/module-null-sink.c module_null_sink_la_LDFLAGS = -module -avoid-version -module_null_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la # Couplings module_combine_la_SOURCES = modules/module-combine.c module_combine_la_LDFLAGS = -module -avoid-version -module_combine_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_match_la_SOURCES = modules/module-match.c module_match_la_LDFLAGS = -module -avoid-version -module_match_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_tunnel_sink_la_SOURCES = modules/module-tunnel.c module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) module_tunnel_sink_la_LDFLAGS = -module -avoid-version -module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la +module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la module_tunnel_source_la_SOURCES = modules/module-tunnel.c module_tunnel_source_la_LDFLAGS = -module -avoid-version -module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la +module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la # X11 module_x11_bell_la_SOURCES = modules/module-x11-bell.c module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) module_x11_bell_la_LDFLAGS = -module -avoid-version -module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libpolypcore.la +module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libpulsecore.la module_x11_publish_la_SOURCES = modules/module-x11-publish.c module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) @@ -1063,7 +1063,7 @@ module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EX liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h liboss_util_la_LDFLAGS = -avoid-version -liboss_util_la_LIBADD = libpolypcore.la +liboss_util_la_LIBADD = libpulsecore.la module_oss_la_SOURCES = modules/module-oss.c module_oss_la_LDFLAGS = -module -avoid-version @@ -1071,23 +1071,23 @@ module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la module_oss_mmap_la_SOURCES = modules/module-oss-mmap.c module_oss_mmap_la_LDFLAGS = -module -avoid-version -module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la libpolypcore.la +module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore.la # ALSA libalsa_util_la_SOURCES = modules/alsa-util.c modules/alsa-util.h libalsa_util_la_LDFLAGS = -avoid-version -libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpolypcore.la +libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore.la libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c module_alsa_sink_la_LDFLAGS = -module -avoid-version -module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpolypcore.la +module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore.la module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) module_alsa_source_la_SOURCES = modules/module-alsa-source.c module_alsa_source_la_LDFLAGS = -module -avoid-version -module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpolypcore.la +module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore.la module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) # Solaris @@ -1100,75 +1100,75 @@ module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la libhowl_wrap_la_SOURCES = modules/howl-wrap.c modules/howl-wrap.h libhowl_wrap_la_LDFLAGS = -avoid-version -libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libpolypcore.la +libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libpulsecore.la libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS) module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c module_zeroconf_publish_la_LDFLAGS = -module -avoid-version -module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la libpolypcore.la +module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la libpulsecore.la module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS) # LIRC module_lirc_la_SOURCES = modules/module-lirc.c module_lirc_la_LDFLAGS = -module -avoid-version -module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpolypcore.la +module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpulsecore.la module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS) # Linux evdev module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c module_mmkbd_evdev_la_LDFLAGS = -module -avoid-version -module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS) # Windows waveout module_waveout_la_SOURCES = modules/module-waveout.c module_waveout_la_LDFLAGS = -module -avoid-version -module_waveout_la_LIBADD = $(AM_LIBADD) libpolypcore.la -lwinmm +module_waveout_la_LIBADD = $(AM_LIBADD) libpulsecore.la -lwinmm module_waveout_la_CFLAGS = $(AM_CFLAGS) # Hardware autodetection module module_detect_la_SOURCES = modules/module-detect.c module_detect_la_LDFLAGS = -module -avoid-version -module_detect_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_detect_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_detect_la_CFLAGS = $(AM_CFLAGS) # Volume restore module module_volume_restore_la_SOURCES = modules/module-volume-restore.c module_volume_restore_la_LDFLAGS = -module -avoid-version -module_volume_restore_la_LIBADD = $(AM_LIBADD) libpolypcore.la +module_volume_restore_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_volume_restore_la_CFLAGS = $(AM_CFLAGS) # RTP modules module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c module_rtp_send_la_LDFLAGS = -module -avoid-version -module_rtp_send_la_LIBADD = $(AM_LIBADD) libpolypcore.la librtp.la +module_rtp_send_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la module_rtp_send_la_CFLAGS = $(AM_CFLAGS) module_rtp_recv_la_SOURCES = modules/rtp/module-rtp-recv.c module_rtp_recv_la_LDFLAGS = -module -avoid-version -module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpolypcore.la librtp.la +module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la module_rtp_recv_la_CFLAGS = $(AM_CFLAGS) # JACK module_jack_sink_la_SOURCES = modules/module-jack-sink.c module_jack_sink_la_LDFLAGS = -module -avoid-version -module_jack_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(JACK_LIBS) +module_jack_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS) module_jack_sink_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS) module_jack_source_la_SOURCES = modules/module-jack-source.c module_jack_source_la_LDFLAGS = -module -avoid-version -module_jack_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(JACK_LIBS) +module_jack_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS) module_jack_source_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS) ################################### # Some minor stuff # ################################### -suid: polypaudio +suid: pulse chown root $< chmod u+s $< @@ -1179,7 +1179,7 @@ esdcompat: daemon/esdcompat.in Makefile -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@ -client.conf: polyp/client.conf.in Makefile +client.conf: pulse/client.conf.in Makefile sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@ if OS_IS_WIN32 @@ -1195,11 +1195,11 @@ daemon.conf: daemon/daemon.conf.in Makefile -e 's,@DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@ install-exec-hook: - chown root $(DESTDIR)$(bindir)/polypaudio ; true - chmod u+s $(DESTDIR)$(bindir)/polypaudio + chown root $(DESTDIR)$(bindir)/pulseaudio ; true + chmod u+s $(DESTDIR)$(bindir)/pulseaudio ln -sf pacat $(DESTDIR)$(bindir)/parec rm -f $(DESTDIR)$(modlibexecdir)/*.a - rm -f $(DESTDIR)$(libdir)/libpolypdsp.a - rm -f $(DESTDIR)$(libdir)/libpolypdsp.la + rm -f $(DESTDIR)$(libdir)/libpulsedsp.a + rm -f $(DESTDIR)$(libdir)/libpulsedsp.la .PHONY: utils/padsp -- cgit