###################################
polypincludedir=$(includedir)/polyp
+polypcoreincludedir=$(includedir)/polypcore
polypconfdir=$(sysconfdir)/polypaudio
modlibdir=$(libdir)/polypaudio
# Compiler/linker flags #
###################################
-AM_CFLAGS = -I$(top_srcdir)
+AM_CFLAGS = -I$(top_srcdir)/src
AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
AM_CFLAGS += $(LTDLINCL)
AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
daemon.conf.in \
default.pa.in \
depmod.py \
- esdcompat.sh.in \
- module-defs.h.m4
+ utils/esdcompat.sh.in \
+ modules/module-defs.h.m4
polypconf_DATA = default.pa daemon.conf client.conf
-BUILT_SOURCES = polyplib-version.h
+BUILT_SOURCES = polyp/polyplib-version.h
###################################
# Main daemon #
bin_PROGRAMS = polypaudio
polypaudio_SOURCES = \
- caps.h caps.c \
- cmdline.c cmdline.h \
- cpulimit.c cpulimit.h \
- conf-parser.h conf-parser.c \
- daemon-conf.c daemon-conf.h \
- dumpmodules.c dumpmodules.h \
- gcc-printf.h \
- main.c \
- pid.c pid.h
+ 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
polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
polypaudio_CPPFLAGS = $(AM_CPPFLAGS)
bin_PROGRAMS += pabrowse
endif
-bin_SCRIPTS = esdcompat.sh
+bin_SCRIPTS = utils/esdcompat.sh
-pacat_SOURCES = pacat.c
+pacat_SOURCES = utils/pacat.c
pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
pacat_CFLAGS = $(AM_CFLAGS)
pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-paplay_SOURCES = paplay.c
+paplay_SOURCES = utils/paplay.c
paplay_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pactl_SOURCES = pactl.c
+pactl_SOURCES = utils/pactl.c
pactl_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pacmd_SOURCES = pacmd.c util.c util.h xmalloc.c xmalloc.h log.c log.h pid.c pid.h
+pacmd_SOURCES = utils/pacmd.c polypcore/pid.c polypcore/pid.h
pacmd_CFLAGS = $(AM_CFLAGS)
-pacmd_LDADD = $(AM_LDADD)
+pacmd_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pax11publish_SOURCES = pax11publish.c util.c util.h xmalloc.c xmalloc.h log.c log.h authkey.c authkey.h client-conf.c client-conf.h conf-parser.c conf-parser.h x11prop.c x11prop.h random.c random.h
+pax11publish_SOURCES = utils/pax11publish.c
pax11publish_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-pax11publish_LDADD = $(AM_LDADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+pax11publish_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pabrowse_SOURCES = pabrowse.c
+pabrowse_SOURCES = utils/pabrowse.c
pabrowse_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-browse-@PA_MAJORMINOR@.la
pabrowse_CFLAGS = $(AM_CFLAGS)
pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mainloop-test-glib12
endif
-mainloop_test_SOURCES = mainloop-test.c
+mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-@PA_MAJORMINOR@.la
mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-mcalign_test_SOURCES = mcalign-test.c util.c util.h xmalloc.c xmalloc.h log.c log.h mcalign.c mcalign.h memchunk.c memchunk.h memblock.c memblock.h
+mcalign_test_SOURCES = tests/mcalign-test.c
mcalign_test_CFLAGS = $(AM_CFLAGS)
-mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pacat_simple_SOURCES = pacat-simple.c
+pacat_simple_SOURCES = tests/pacat-simple.c
pacat_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
pacat_simple_CFLAGS = $(AM_CFLAGS)
pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-parec_simple_SOURCES = parec-simple.c
+parec_simple_SOURCES = tests/parec-simple.c
parec_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
parec_simple_CFLAGS = $(AM_CFLAGS)
parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-strlist_test_SOURCES = strlist-test.c strlist.c strlist.h strbuf.c strbuf.h util.c util.h xmalloc.c xmalloc.h log.c log.h
+strlist_test_SOURCES = tests/strlist-test.c
strlist_test_CFLAGS = $(AM_CFLAGS)
-strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la libstrlist.la
strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-voltest_SOURCES = voltest.c sample.c volume.c volume.h sample.h
+voltest_SOURCES = tests/voltest.c
voltest_CFLAGS = $(AM_CFLAGS)
-voltest_LDADD = $(AM_LDADD)
+voltest_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h idxset.c idxset.h
+cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
cpulimit_test_CFLAGS = $(AM_CFLAGS)
-cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
+cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolypcore.la
cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h idxset.c idxset.h
+cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
-cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
+cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolypcore.la
cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
###################################
polypinclude_HEADERS = \
- cdecl.h \
- channelmap.h \
- glib-mainloop.h \
- mainloop.h \
- mainloop-api.h \
- mainloop-signal.h \
- polyplib.h \
- polyplib-context.h \
- polyplib-def.h \
- polyplib-error.h \
- polyplib-introspect.h \
- polyplib-operation.h \
- polyplib-scache.h \
- polyplib-simple.h \
- polyplib-stream.h \
- polyplib-subscribe.h \
- polyplib-version.h \
- sample.h \
- volume.h
+ polyp/cdecl.h \
+ polyp/channelmap.h \
+ polyp/glib-mainloop.h \
+ polyp/mainloop.h \
+ polyp/mainloop-api.h \
+ polyp/mainloop-signal.h \
+ polyp/polyplib.h \
+ polyp/polyplib-context.h \
+ polyp/polyplib-def.h \
+ polyp/polyplib-error.h \
+ polyp/polyplib-introspect.h \
+ polyp/polyplib-operation.h \
+ polyp/polyplib-scache.h \
+ polyp/polyplib-simple.h \
+ polyp/polyplib-stream.h \
+ polyp/polyplib-subscribe.h \
+ polyp/polyplib-version.h \
+ polyp/sample.h \
+ polyp/volume.h
if HAVE_HOWL
polypinclude_HEADERS += \
- polyplib-browser.h
+ polyp/polyplib-browser.h
endif
lib_LTLIBRARIES = \
libpolyp-mainloop-glib12-@PA_MAJORMINOR@.la
endif
+# Public interface
libpolyp_@PA_MAJORMINOR@_la_SOURCES = \
- authkey.c authkey.h \
- cdecl.h \
- client-conf.c client-conf.h \
- conf-parser.c conf-parser.h \
- dllmain.c \
- dynarray.c dynarray.h \
- gcc-printf.h \
- idxset.c idxset.h \
- iochannel.c iochannel.h \
- llist.h \
- log.c log.h \
- mainloop-api.c mainloop-api.h \
- mcalign.c mcalign.h \
- memblock.c memblock.h \
- memchunk.c memchunk.h \
- native-common.h \
- packet.c packet.h \
- parseaddr.c parseaddr.h \
- pdispatch.c pdispatch.h \
- polyplib.h \
- polyplib-context.c polyplib-context.h \
- polyplib-def.h \
- polyplib-internal.h \
- polyplib-introspect.c polyplib-introspect.h \
- polyplib-operation.c polyplib-operation.h \
- polyplib-scache.c polyplib-scache.h \
- polyplib-stream.c polyplib-stream.h \
- polyplib-subscribe.c polyplib-subscribe.h \
- pstream.c pstream.h \
- pstream-util.c pstream-util.h \
- queue.c queue.h \
- random.c random.h \
- sample.c sample.h \
- socket-client.c socket-client.h \
- socket-util.c socket-util.h \
- strbuf.c strbuf.h \
- strlist.c strlist.h \
- tagstruct.c tagstruct.h \
- util.c util.h \
- winsock.h \
- xmalloc.c xmalloc.h \
- channelmap.c channelmap.h \
- volume.c volume.h
+ polyp/cdecl.h \
+ polyp/channelmap.c polyp/channelmap.h \
+ polyp/client-conf.c polyp/client-conf.h \
+ polyp/llist.h \
+ polyp/mainloop-api.c polyp/mainloop-api.h \
+ polyp/polyplib.h \
+ polyp/polyplib-context.c polyp/polyplib-context.h \
+ polyp/polyplib-def.h \
+ polyp/polyplib-internal.h \
+ polyp/polyplib-introspect.c polyp/polyplib-introspect.h \
+ polyp/polyplib-operation.c polyp/polyplib-operation.h \
+ polyp/polyplib-scache.c polyp/polyplib-scache.h \
+ polyp/polyplib-stream.c polyp/polyplib-stream.h \
+ polyp/polyplib-subscribe.c polyp/polyplib-subscribe.h \
+ polyp/sample.c polyp/sample.h \
+ polyp/volume.c polyp/volume.h
+
+# Internal stuff that is shared with libpolypcore
+libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
+ polypcore/authkey.c polypcore/authkey.h \
+ polypcore/conf-parser.c polypcore/conf-parser.h \
+ polypcore/dllmain.c \
+ polypcore/dynarray.c polypcore/dynarray.h \
+ polypcore/gccmacro.h \
+ polypcore/idxset.c polypcore/idxset.h \
+ polypcore/iochannel.c polypcore/iochannel.h \
+ polypcore/log.c polypcore/log.h \
+ polypcore/mcalign.c polypcore/mcalign.h \
+ polypcore/memblock.c polypcore/memblock.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/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/util.c polypcore/util.h \
+ polypcore/winsock.h \
+ polypcore/xmalloc.c polypcore/xmalloc.h
if HAVE_X11
libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
- client-conf-x11.c client-conf-x11.h \
- x11prop.c x11prop.h
+ polyp/client-conf-x11.c polyp/client-conf-x11.h \
+ polypcore/x11prop.c polypcore/x11prop.h
endif
libpolyp_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)
endif
-libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyplib-error.c polyplib-error.h
+libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-error.c polyp/polyplib-error.h
libpolyp_error_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_error_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la
libpolyp_error_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_@PA_MAJORMINOR@_la_SOURCES = \
- mainloop.c mainloop.h \
- mainloop-api.h mainloop-api.c \
- mainloop-signal.c mainloop-signal.h \
- poll.c poll.h
+ polyp/mainloop.c polyp/mainloop.h \
+ polyp/mainloop-signal.c polyp/mainloop-signal.h \
+ polypcore/poll.c polypcore/poll.h
libpolyp_mainloop_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_mainloop_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(WINSOCK_LIBS)
libpolyp_mainloop_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyplib-simple.c polyplib-simple.h
+libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-simple.c polyp/polyplib-simple.h
libpolyp_simple_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_simple_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
libpolyp_simple_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyplib-browser.c polyplib-browser.h
+libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-browser.c polyp/polyplib-browser.h
libpolyp_browse_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
libpolyp_browse_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(HOWL_LIBS)
libpolyp_browse_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib-mainloop.c
+libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c
libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB20_LIBS)
libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib12-mainloop.c
+libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c
libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB12_LIBS)
libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
# Daemon core library #
###################################
-polypinclude_HEADERS += \
- cli-command.h \
- client.h \
- core.h \
- dynarray.h \
- endianmacros.h \
- hashmap.h \
- idxset.h \
- iochannel.h \
- memblock.h \
- memblockq.h \
- memchunk.h \
- modargs.h \
- module.h \
- namereg.h \
- queue.h \
- resampler.h \
- sample-util.h \
- sink.h \
- sink-input.h \
- sioman.h \
- socket-server.h \
- socket-client.h \
- socket-util.h \
- source.h \
- source-output.h \
- strbuf.h \
- tokenizer.h \
- tagstruct.h \
- util.h
+polypcoreinclude_HEADERS = \
+ polypcore/cli-command.h \
+ polypcore/client.h \
+ polypcore/core.h \
+ polypcore/dynarray.h \
+ polypcore/endianmacros.h \
+ polypcore/hashmap.h \
+ polypcore/idxset.h \
+ polypcore/iochannel.h \
+ polypcore/log.h \
+ polypcore/memblock.h \
+ polypcore/memblockq.h \
+ polypcore/memchunk.h \
+ polypcore/modargs.h \
+ polypcore/module.h \
+ polypcore/namereg.h \
+ polypcore/queue.h \
+ polypcore/resampler.h \
+ polypcore/sample-util.h \
+ polypcore/sink.h \
+ polypcore/sink-input.h \
+ polypcore/sioman.h \
+ polypcore/socket-server.h \
+ polypcore/socket-client.h \
+ polypcore/socket-util.h \
+ polypcore/source.h \
+ polypcore/source-output.h \
+ polypcore/strbuf.h \
+ polypcore/tokenizer.h \
+ polypcore/tagstruct.h \
+ polypcore/util.h
lib_LTLIBRARIES += libpolypcore.la
+# Some public stuff is used even in the core.
libpolypcore_la_SOURCES = \
- autoload.c autoload.h \
- cli-command.c cli-command.h \
- cli-text.c cli-text.h \
- client.c client.h \
- core.c core.h \
- dllmain.c \
- dynarray.c dynarray.h \
- endianmacros.h \
- g711.c g711.h \
- hashmap.c hashmap.h \
- idxset.c idxset.h \
- log.c log.h \
- mainloop.c mainloop.h \
- mainloop-api.c mainloop-api.h \
- mainloop-signal.c mainloop-signal.h \
- mcalign.c mcalign.h \
- memblock.c memblock.h \
- memblockq.c memblockq.h \
- memchunk.c memchunk.h \
- modargs.c modargs.h \
- modinfo.c modinfo.h \
- module.c module.h \
- namereg.c namereg.h \
- play-memchunk.c play-memchunk.h \
- poll.c poll.h \
- props.c props.h \
- queue.c queue.h \
- random.c random.h \
- resampler.c resampler.h \
- sample.c sample.h \
- sample-util.c sample-util.h \
- scache.c scache.h \
- sconv.c sconv.h \
- sconv-s16be.c sconv-s16be.h \
- sconv-s16le.c sconv-s16le.h \
- sink.c sink.h \
- sink-input.c sink-input.h \
- sioman.c sioman.h \
- sound-file.c sound-file.h \
- sound-file-stream.c sound-file-stream.h \
- source.c source.h \
- source-output.c source-output.h \
- strbuf.c strbuf.h \
- subscribe.c subscripe.h \
- tokenizer.c tokenizer.h \
- util.c util.h \
- winsock.h \
- xmalloc.c xmalloc.h \
- volume.c volume.h \
- channelmap.c channelmap.h
+ polyp/channelmap.c polyp/channelmap.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/volume.c polyp/volume.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/dllmain.c \
+ 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/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/scache.c polypcore/scache.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/subscribe.c polypcore/subscribe.h \
+ polypcore/tokenizer.c polypcore/tokenizer.h \
+ polypcore/util.c polypcore/util.h \
+ polypcore/winsock.h \
+ polypcore/xmalloc.c polypcore/xmalloc.h
libpolypcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
libpolypcore_la_LDFLAGS = -avoid-version
libhowl-wrap.la
endif
-libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
+libprotocol_simple_la_SOURCES = polypcore/protocol-simple.c polypcore/protocol-simple.h
libprotocol_simple_la_LDFLAGS = -avoid-version
libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-server.la libiochannel.la
libsocket_server_la_SOURCES = \
- inet_ntop.c inet_ntop.h \
- socket-server.c socket-server.h
+ polypcore/inet_ntop.c polypcore/inet_ntop.h \
+ polypcore/socket-server.c polypcore/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_client_la_SOURCES = socket-client.c socket-client.h
+libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/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_CFLAGS = $(AM_CFLAGS) $(LIBASYNCNS_CFLAGS)
-libparseaddr_la_SOURCES = parseaddr.c parseaddr.h
+libparseaddr_la_SOURCES = polypcore/parseaddr.c polypcore/parseaddr.h
libparseaddr_la_LDFLAGS = -avoid-version
libparseaddr_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libpstream_la_SOURCES = pstream.c pstream.h
+libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h
libpstream_la_LDFLAGS = -avoid-version
libpstream_la_LIBADD = $(AM_LIBADD) libpolypcore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
-libpstream_util_la_SOURCES = pstream-util.c pstream-util.h
+libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h
libpstream_util_la_LDFLAGS = -avoid-version
libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
-libpdispatch_la_SOURCES = pdispatch.c pdispatch.h
+libpdispatch_la_SOURCES = polypcore/pdispatch.c polypcore/pdispatch.h
libpdispatch_la_LDFLAGS = -avoid-version
libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpolypcore.la
-libiochannel_la_SOURCES = iochannel.c iochannel.h
+libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h
libiochannel_la_LDFLAGS = -avoid-version
libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpolypcore.la $(WINSOCK_LIBS)
-libpacket_la_SOURCES = packet.c packet.h
+libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h
libpacket_la_LDFLAGS = -avoid-version
libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libioline_la_SOURCES = ioline.c ioline.h
+libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h
libioline_la_LDFLAGS = -avoid-version
libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la
-libcli_la_SOURCES = cli.c cli.h
+libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h
libcli_la_CPPFLAGS = $(AM_CPPFLAGS)
libcli_la_LDFLAGS = -avoid-version
libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpolypcore.la
-libstrlist_la_SOURCES = strlist.c strlist.h
+libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h
libstrlist_la_LDFLAGS = -avoid-version
libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libprotocol_cli_la_SOURCES = protocol-cli.c protocol-cli.h
+libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/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_http_la_SOURCES = protocol-http.c protocol-http.h
+libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/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_native_la_SOURCES = protocol-native.c protocol-native.h native-common.h
+libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/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
-libtagstruct_la_SOURCES = tagstruct.c tagstruct.h
+libtagstruct_la_SOURCES = polypcore/tagstruct.c polypcore/tagstruct.h
libtagstruct_la_LDFLAGS = -avoid-version
libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS)
-libprotocol_esound_la_SOURCES = protocol-esound.c protocol-esound.h esound.h
+libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h
libprotocol_esound_la_LDFLAGS = -avoid-version
libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpolypcore.la
-libauthkey_la_SOURCES = authkey.c authkey.h
+libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h
libauthkey_la_LDFLAGS = -avoid-version
libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libauthkey_prop_la_SOURCES = authkey-prop.c authkey-prop.h
+libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h
libauthkey_prop_la_LDFLAGS = -avoid-version
libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libsocket_util_la_SOURCES = socket-util.c socket-util.h
+libsocket_util_la_SOURCES = polypcore/socket-util.c polypcore/socket-util.h
libsocket_util_la_LDFLAGS = -avoid-version
libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS)
# X11
-libx11wrap_la_SOURCES = x11wrap.c x11wrap.h
+libx11wrap_la_SOURCES = polypcore/x11wrap.c polypcore/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)
-libx11prop_la_SOURCES = x11prop.c x11prop.h
+libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/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)
# OSS
-liboss_util_la_SOURCES = oss-util.c oss-util.h
+liboss_util_la_SOURCES = polypcore/oss-util.c polypcore/oss-util.h
liboss_util_la_LDFLAGS = -avoid-version
# ALSA
-libalsa_util_la_SOURCES = alsa-util.c alsa-util.h
+libalsa_util_la_SOURCES = polypcore/alsa-util.c polypcore/alsa-util.h
libalsa_util_la_LDFLAGS = -avoid-version
libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS)
libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
# HOWL
-libhowl_wrap_la_SOURCES = howl-wrap.c howl-wrap.h
+libhowl_wrap_la_SOURCES = polypcore/howl-wrap.c polypcore/howl-wrap.h
libhowl_wrap_la_LDFLAGS = -avoid-version
libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS)
libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
# These are generated by a M4 script
SYMDEF_FILES = \
- module-cli-symdef.h \
- module-cli-protocol-tcp-symdef.h \
- module-cli-protocol-tcp6-symdef.h \
- module-cli-protocol-unix-symdef.h \
- module-pipe-sink-symdef.h \
- module-pipe-source-symdef.h \
- module-simple-protocol-tcp-symdef.h \
- module-simple-protocol-tcp6-symdef.h \
- module-simple-protocol-unix-symdef.h \
- module-esound-protocol-tcp-symdef.h \
- module-esound-protocol-tcp6-symdef.h \
- module-esound-protocol-unix-symdef.h \
- module-native-protocol-tcp-symdef.h \
- module-native-protocol-tcp6-symdef.h \
- module-native-protocol-unix-symdef.h \
- module-native-protocol-fd-symdef.h \
- module-sine-symdef.h \
- module-combine-symdef.h \
- module-esound-compat-spawnfd-symdef.h \
- module-esound-compat-spawnpid-symdef.h \
- module-match-symdef.h \
- module-tunnel-sink-symdef.h \
- module-tunnel-source-symdef.h \
- module-null-sink-symdef.h \
- module-esound-sink-symdef.h \
- module-zeroconf-publish-symdef.h \
- module-lirc-symdef.h \
- module-mmkbd-evdev-symdef.h \
- module-http-protocol-tcp-symdef.h \
- module-http-protocol-tcp6-symdef.h \
- module-http-protocol-unix-symdef.h \
- module-x11-bell-symdef.h \
- module-x11-publish-symdef.h \
- module-oss-symdef.h \
- module-oss-mmap-symdef.h \
- module-alsa-sink-symdef.h \
- module-alsa-source-symdef.h \
- module-solaris-symdef.h \
- module-waveout-symdef.h \
- module-detect-symdef.h
+ modules/module-cli-symdef.h \
+ modules/module-cli-protocol-tcp-symdef.h \
+ modules/module-cli-protocol-tcp6-symdef.h \
+ modules/module-cli-protocol-unix-symdef.h \
+ modules/module-pipe-sink-symdef.h \
+ modules/module-pipe-source-symdef.h \
+ modules/module-simple-protocol-tcp-symdef.h \
+ modules/module-simple-protocol-tcp6-symdef.h \
+ modules/module-simple-protocol-unix-symdef.h \
+ modules/module-esound-protocol-tcp-symdef.h \
+ modules/module-esound-protocol-tcp6-symdef.h \
+ modules/module-esound-protocol-unix-symdef.h \
+ modules/module-native-protocol-tcp-symdef.h \
+ modules/module-native-protocol-tcp6-symdef.h \
+ modules/module-native-protocol-unix-symdef.h \
+ modules/module-native-protocol-fd-symdef.h \
+ modules/module-sine-symdef.h \
+ modules/module-combine-symdef.h \
+ modules/module-esound-compat-spawnfd-symdef.h \
+ modules/module-esound-compat-spawnpid-symdef.h \
+ modules/module-match-symdef.h \
+ modules/module-tunnel-sink-symdef.h \
+ modules/module-tunnel-source-symdef.h \
+ modules/module-null-sink-symdef.h \
+ modules/module-esound-sink-symdef.h \
+ modules/module-zeroconf-publish-symdef.h \
+ modules/module-lirc-symdef.h \
+ modules/module-mmkbd-evdev-symdef.h \
+ modules/module-http-protocol-tcp-symdef.h \
+ modules/module-http-protocol-tcp6-symdef.h \
+ modules/module-http-protocol-unix-symdef.h \
+ modules/module-x11-bell-symdef.h \
+ modules/module-x11-publish-symdef.h \
+ modules/module-oss-symdef.h \
+ modules/module-oss-mmap-symdef.h \
+ modules/module-alsa-sink-symdef.h \
+ modules/module-alsa-source-symdef.h \
+ modules/module-solaris-symdef.h \
+ modules/module-waveout-symdef.h \
+ modules/module-detect-symdef.h
EXTRA_DIST += $(SYMDEF_FILES)
BUILT_SOURCES += $(SYMDEF_FILES)
-$(SYMDEF_FILES): module-defs.h.m4
+$(SYMDEF_FILES): modules/module-defs.h.m4
$(M4) -Dfname="$@" $< > $@
# Simple protocol
-module_simple_protocol_tcp_la_SOURCES = module-protocol-stub.c
+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_tcp6_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_simple_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
module_simple_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_simple_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
-module_simple_protocol_unix_la_SOURCES = module-protocol-stub.c
+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
# CLI protocol
-module_cli_la_SOURCES = module-cli.c
+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_protocol_tcp_la_SOURCES = module-protocol-stub.c
+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_tcp6_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_cli_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
module_cli_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_cli_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
-module_cli_protocol_unix_la_SOURCES = module-protocol-stub.c
+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
# HTTP protocol
-module_http_protocol_tcp_la_SOURCES = module-protocol-stub.c
+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_tcp6_la_SOURCES = module-protocol-stub.c
+module_http_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_http_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
module_http_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_http_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
-module_http_protocol_unix_la_SOURCES = module-protocol-stub.c
+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
# Native protocol
-module_native_protocol_tcp_la_SOURCES = module-protocol-stub.c
+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_tcp6_la_SOURCES = module-protocol-stub.c
+module_native_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_native_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
module_native_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_native_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
-module_native_protocol_unix_la_SOURCES = module-protocol-stub.c
+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_fd_la_SOURCES = module-native-protocol-fd.c
+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
# EsounD protocol
-module_esound_protocol_tcp_la_SOURCES = module-protocol-stub.c
+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_tcp6_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_esound_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
module_esound_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_esound_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
-module_esound_protocol_unix_la_SOURCES = module-protocol-stub.c
+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_compat_spawnfd_la_SOURCES = module-esound-compat-spawnfd.c
+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_spawnpid_la_SOURCES = module-esound-compat-spawnpid.c
+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_sink_la_SOURCES = module-esound-sink.c
+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
# Pipes
-module_pipe_sink_la_SOURCES = module-pipe-sink.c
+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_source_la_SOURCES = module-pipe-source.c
+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
# Fake sources/sinks
-module_sine_la_SOURCES = module-sine.c
+module_sine_la_SOURCES = modules/module-sine.c
module_sine_la_LDFLAGS = -module -avoid-version
module_sine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_null_sink_la_SOURCES = module-null-sink.c
+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
# Couplings
-module_combine_la_SOURCES = module-combine.c
+module_combine_la_SOURCES = modules/module-combine.c
module_combine_la_LDFLAGS = -module -avoid-version
module_combine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_match_la_SOURCES = module-match.c
+module_match_la_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = -module -avoid-version
module_match_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_tunnel_sink_la_SOURCES = module-tunnel.c
+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_source_la_SOURCES = module-tunnel.c
+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
# X11
-module_x11_bell_la_SOURCES = module-x11-bell.c
+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
-module_x11_publish_la_SOURCES = module-x11-publish.c
+module_x11_publish_la_SOURCES = modules/module-x11-publish.c
module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
module_x11_publish_la_LDFLAGS = -module -avoid-version
module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauthkey-prop.la libx11prop.la libstrlist.la
# OSS
-module_oss_la_SOURCES = module-oss.c
+module_oss_la_SOURCES = modules/module-oss.c
module_oss_la_LDFLAGS = -module -avoid-version
module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la
-module_oss_mmap_la_SOURCES = module-oss-mmap.c
+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
# ALSA
-module_alsa_sink_la_SOURCES = module-alsa-sink.c
+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
module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
-module_alsa_source_la_SOURCES = module-alsa-source.c
+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
module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
# Solaris
-module_solaris_la_SOURCES = module-solaris.c
+module_solaris_la_SOURCES = modules/module-solaris.c
module_solaris_la_LDFLAGS = -module -avoid-version
module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la
# HOWL
-module_zeroconf_publish_la_SOURCES = module-zeroconf-publish.c
+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
module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
# LIRC
-module_lirc_la_SOURCES = module-lirc.c
+module_lirc_la_SOURCES = modules/module-lirc.c
module_lirc_la_LDFLAGS = -module -avoid-version
module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS)
module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
# Linux evdev
-module_mmkbd_evdev_la_SOURCES = module-mmkbd-evdev.c
+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)
module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS)
# Windows waveout
-module_waveout_la_SOURCES = module-waveout.c
+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_CFLAGS = $(AM_CFLAGS)
# Hardware autodetection module
-module_detect_la_SOURCES = module-detect.c
+module_detect_la_SOURCES = modules/module-detect.c
module_detect_la_LDFLAGS = -module -avoid-version
module_detect_la_LIBADD = $(AM_LIBADD)
module_detect_la_CFLAGS = $(AM_CFLAGS)
chown root $<
chmod u+s $<
-esdcompat.sh: esdcompat.sh.in Makefile
+utils/esdcompat.sh: utils/esdcompat.sh.in Makefile
sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@