* split pa_cstrerror() into its own file polypcore/core-error.[ch]

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 72db5f80e684eb6d2e958d1bd4002b727cfdd0c1..3a8c9bba7fdf0d6dafd1c5412ec2bb8cc6013007 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,6 +78,7 @@ EXTRA_DIST = \
                daemon/default.pa.in \
                depmod.py \
                daemon/esdcompat.sh.in \
+               utils/padsp \
                modules/module-defs.h.m4
 
 polypconf_DATA = \
@@ -271,17 +272,9 @@ mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MA
 mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la
 mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-memblockq_test_SOURCES = \
-       tests/memblockq-test.c \
-       polyp/xmalloc.c \
-       polypcore/memblockq.c \
-       polypcore/log.c \
-       polypcore/memblock.c \
-       polypcore/util.c \
-       polypcore/mcalign.c \
-       polypcore/memchunk.c
+memblockq_test_SOURCES = tests/memblockq-test.c
 memblockq_test_CFLAGS = $(AM_CFLAGS)
-memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
 memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 sync_playback_SOURCES = tests/sync-playback.c
@@ -296,24 +289,25 @@ sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 polypinclude_HEADERS = \
                polyp/cdecl.h \
                polyp/channelmap.h \
-               polyp/glib-mainloop.h \
-               polyp/mainloop.h \
-               polyp/mainloop-api.h \
-               polyp/mainloop-signal.h \
-               polyp/thread-mainloop.h \
-               polyp/polypaudio.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/version.h \
-               polyp/sample.h \
+               polyp/thread-mainloop.h \
+               polyp/timeval.h \
                polyp/utf8.h \
+               polyp/util.h \
+               polyp/version.h \
                polyp/volume.h \
                polyp/xmalloc.h
 
@@ -322,6 +316,16 @@ polypinclude_HEADERS += \
                polyp/browser.h
 endif
 
+if HAVE_GLIB20
+polypinclude_HEADERS += \
+               polyp/glib-mainloop.h
+else
+if HAVE_GLIB12
+polypinclude_HEADERS += \
+               polyp/glib-mainloop.h
+endif
+endif
+
 lib_LTLIBRARIES = \
                libpolyp.la \
                libpolyp-simple.la
@@ -346,36 +350,38 @@ libpolyp_la_SOURCES = \
                polyp/cdecl.h \
                polyp/channelmap.c polyp/channelmap.h \
                polyp/client-conf.c polyp/client-conf.h \
-               polyp/mainloop-api.c polyp/mainloop-api.h \
-               polyp/polypaudio.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/sample.c polyp/sample.h \
-               polyp/volume.c polyp/volume.h \
-               polyp/utf8.c polyp/utf8.h \
-               polyp/mainloop.c polyp/mainloop.h \
-               polyp/mainloop-signal.c polyp/mainloop-signal.h \
                polyp/thread-mainloop.c polyp/thread-mainloop.h \
-               polyp/xmalloc.c polyp/xmalloc.h \
-               polypcore/pipe.c polypcore/pipe.h \
-               polypcore/poll.c polypcore/poll.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/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 \
@@ -385,6 +391,8 @@ libpolyp_la_SOURCES += \
                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 \
@@ -394,9 +402,8 @@ libpolyp_la_SOURCES += \
                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/llist.h
+               polypcore/core-error.c polypcore/core-error.h \
+               polypcore/winsock.h
 
 if OS_IS_WIN32
 libpolyp_la_SOURCES += \
@@ -443,6 +450,23 @@ 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)
 
+###################################
+#         OSS emulation           #
+###################################
+
+if HAVE_OSS
+
+lib_LTLIBRARIES += libpolypdsp.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
+
 ###################################
 #      Daemon core library        #
 ###################################
@@ -457,6 +481,7 @@ polypcoreinclude_HEADERS = \
                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 \
@@ -486,20 +511,22 @@ polypcoreinclude_HEADERS = \
                polypcore/source.h \
                polypcore/source-output.h \
                polypcore/strbuf.h \
-               polypcore/tokenizer.h \
-               polypcore/util.h
+               polypcore/tokenizer.h
 
 lib_LTLIBRARIES += libpolypcore.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/volume.c polyp/volume.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).
@@ -512,6 +539,7 @@ libpolypcore_la_SOURCES += \
                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 \
@@ -547,8 +575,8 @@ libpolypcore_la_SOURCES += \
                polypcore/source-output.c polypcore/source-output.h \
                polypcore/strbuf.c polypcore/strbuf.h \
                polypcore/tokenizer.c polypcore/tokenizer.h \
-               polypcore/util.c polypcore/util.h \
-               polypcore/winsock.h
+               polypcore/winsock.h \
+               polypcore/core-error.c polypcore/core-error.h
 
 if OS_IS_WIN32
 libpolypcore_la_SOURCES += \
@@ -1133,7 +1161,7 @@ suid: polypaudio
        chown root $<
        chmod u+s $<
 
-CLEANFILES=esdcompat.sh client.conf default.pa daemon.conf
+CLEANFILES = esdcompat.sh client.conf default.pa daemon.conf
 
 esdcompat.sh: daemon/esdcompat.sh.in Makefile
        sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@@ -1160,3 +1188,5 @@ install-exec-hook:
        chmod u+s $(DESTDIR)$(bindir)/polypaudio
        ln -sf pacat $(DESTDIR)$(bindir)/parec
        rm -f $(DESTDIR)$(modlibexecdir)/*.a
+
+.PHONY: utils/padsp