* modify pa_context_exit_daemon() to return a pa_operation object

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 92c7dae1879540d52c817942e31b59efab78701b..ed97f4905695cdc7867486393ff03bc5cd32df24 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,8 +47,8 @@ AM_CFLAGS = -I$(top_srcdir)/src
 AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
 AM_CFLAGS += $(LTDLINCL)
 AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
-AM_CFLAGS += -DDLSEARCHPATH=\"$(modlibdir)\"
-#AM_CFLAGS += -DDLSEARCHPATH=\"$(shell pwd)\"
+#AM_CFLAGS += -DDLSEARCHPATH=\"$(modlibdir)\"
+AM_CFLAGS += -DDLSEARCHPATH=\"$(shell pwd)\"
 AM_CFLAGS += -DDEFAULT_CONFIG_DIR=\"$(DEFAULT_CONFIG_DIR)\"
 AM_CFLAGS += -DPOLYPAUDIO_BINARY=\"$(POLYPAUDIO_BINARY)\"
 
@@ -75,16 +75,20 @@ endif
 ###################################
 
 EXTRA_DIST = \
-               client.conf.in \
-               daemon.conf.in \
-               default.pa.in \
+               polyp/client.conf.in \
+               daemon/daemon.conf.in \
+               daemon/default.pa.in \
                depmod.py \
-               utils/esdcompat.sh.in \
+               daemon/esdcompat.sh.in \
                modules/module-defs.h.m4
 
-polypconf_DATA = default.pa daemon.conf client.conf
+polypconf_DATA = \
+               default.pa \
+               daemon.conf \
+               client.conf
 
-BUILT_SOURCES = polyp/polyplib-version.h
+BUILT_SOURCES = \
+               polyp/version.h
 
 ###################################
 #          Main daemon            #
@@ -131,23 +135,23 @@ bin_PROGRAMS += pax11publish
 endif
 
 if HAVE_HOWL
-bin_PROGRAMS +=        pabrowse
+bin_PROGRAMS += pabrowse
 endif
 
-bin_SCRIPTS = utils/esdcompat.sh
+bin_SCRIPTS = esdcompat.sh
 
 pacat_SOURCES = utils/pacat.c
-pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
+pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 pacat_CFLAGS = $(AM_CFLAGS) 
 pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 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_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 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_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -162,7 +166,7 @@ pax11publish_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la $(X_PRE_LIBS) -lX11
 pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 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_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-browse-@PA_MAJORMINOR@.la
 pabrowse_CFLAGS = $(AM_CFLAGS)
 pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -176,7 +180,9 @@ noinst_PROGRAMS = \
                pacat-simple \
                parec-simple \
                strlist-test \
-               voltest
+               voltest \
+               memblockq-test \
+               sync-playback
 
 if HAVE_SIGXCPU
 noinst_PROGRAMS += \
@@ -205,12 +211,12 @@ mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
 mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 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_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.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-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
+parec_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 parec_simple_CFLAGS = $(AM_CFLAGS)
 parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -244,6 +250,24 @@ mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MA
 mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12-@PA_MAJORMINOR@.la
 mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
+memblockq_test_SOURCES = \
+       tests/memblockq-test.c \
+       polypcore/memblockq.c \
+       polypcore/log.c \
+       polypcore/memblock.c \
+       polypcore/xmalloc.c \
+       polypcore/util.c \
+       polypcore/mcalign.c \
+       polypcore/memchunk.c
+memblockq_test_CFLAGS = $(AM_CFLAGS)
+memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
+sync_playback_SOURCES = tests/sync-playback.c
+sync_playback_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
+sync_playback_CFLAGS = $(AM_CFLAGS) 
+sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
 ###################################
 #         Client library          #
 ###################################
@@ -255,28 +279,27 @@ polypinclude_HEADERS = \
                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/polypaudio.h \
+               polyp/context.h \
+               polyp/def.h \
+               polyp/error.h \
+               polyp/introspect.h \
+               polyp/operation.h \
+               polyp/scache.h \
+               polyp/simple.h \
+               polyp/stream.h \
+               polyp/subscribe.h \
+               polyp/version.h \
                polyp/sample.h \
                polyp/volume.h
 
 if HAVE_HOWL
 polypinclude_HEADERS += \
-               polyp/polyplib-browser.h
+               polyp/browser.h
 endif
 
 lib_LTLIBRARIES = \
                libpolyp-@PA_MAJORMINOR@.la \
-               libpolyp-error-@PA_MAJORMINOR@.la \
                libpolyp-mainloop-@PA_MAJORMINOR@.la \
                libpolyp-simple-@PA_MAJORMINOR@.la
 
@@ -302,15 +325,16 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES = \
                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/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/operation.c polyp/operation.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
 
@@ -326,6 +350,7 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
                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 \
@@ -364,11 +389,6 @@ libpolyp_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
 libpolyp_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)
 endif
 
-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 = \
                polyp/mainloop.c polyp/mainloop.h \
                polyp/mainloop-signal.c polyp/mainloop-signal.h \
@@ -377,12 +397,12 @@ 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 = polyp/polyplib-simple.c polyp/polyplib-simple.h 
+libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyp/simple.c polyp/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 = polyp/polyplib-browser.c polyp/polyplib-browser.h 
+libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyp/browser.c polyp/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 
@@ -402,36 +422,46 @@ libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
 ###################################
 
 polypcoreinclude_HEADERS = \
+               polypcore/autoload.h \
                polypcore/cli-command.h \
+               polypcore/cli-text.h \
                polypcore/client.h \
                polypcore/core.h \
+               polypcore/core-scache.h \
+               polypcore/core-subscribe.h \
+               polypcore/conf-parser.h \
                polypcore/dynarray.h \
-               polypcore/endianmacros.h \
+               polypcore/g711.h \
                polypcore/hashmap.h \
                polypcore/idxset.h \
-               polypcore/iochannel.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/socket-server.h \
-               polypcore/socket-client.h \
-               polypcore/socket-util.h \
+               polypcore/sound-file.h \
+               polypcore/sound-file-stream.h \
                polypcore/source.h \
                polypcore/source-output.h \
                polypcore/strbuf.h \
                polypcore/tokenizer.h \
-               polypcore/tagstruct.h \
-               polypcore/util.h
+               polypcore/util.h \
+               polypcore/xmalloc.h
 
 lib_LTLIBRARIES += libpolypcore.la
 
@@ -452,6 +482,8 @@ libpolypcore_la_SOURCES += \
                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/dllmain.c \
                polypcore/dynarray.c polypcore/dynarray.h \
                polypcore/endianmacros.h \
@@ -475,7 +507,6 @@ libpolypcore_la_SOURCES += \
                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 \
@@ -487,7 +518,6 @@ libpolypcore_la_SOURCES += \
                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 \
@@ -501,6 +531,30 @@ libpolypcore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDF
 #   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
+
 ### Warning! Due to an obscure bug in libtool/automake it is required
 ### that the libraries in modlib_LTLIBRARIES are specified in-order,
 ### i.e. libraries near the end of the list depend on libraries near
@@ -529,26 +583,15 @@ modlib_LTLIBRARIES = \
                libprotocol-http.la
 
 if HAVE_X11
+polypcoreinclude_HEADERS += \
+               polypcore/x11wrap.h \
+               polypcore/x11prop.h
+
 modlib_LTLIBRARIES += \
                libx11wrap.la \
                libx11prop.la
 endif
 
-if HAVE_OSS
-modlib_LTLIBRARIES += \
-               liboss-util.la
-endif
-
-if HAVE_ALSA
-modlib_LTLIBRARIES += \
-               libalsa-util.la
-endif
-
-if HAVE_HOWL
-modlib_LTLIBRARIES += \
-               libhowl-wrap.la
-endif
-
 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
@@ -645,25 +688,6 @@ 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 = polypcore/oss-util.c polypcore/oss-util.h
-liboss_util_la_LDFLAGS = -avoid-version
-
-# ALSA
-
-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 = 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)
-
 ###################################
 #        Plug-in libraries        #
 ###################################
@@ -723,12 +747,14 @@ endif
 
 if HAVE_OSS
 modlib_LTLIBRARIES += \
+               liboss-util.la \
                module-oss.la \
                module-oss-mmap.la
 endif
 
 if HAVE_ALSA
 modlib_LTLIBRARIES += \
+               libalsa-util.la \
                module-alsa-sink.la \
                module-alsa-source.la
 endif
@@ -740,6 +766,7 @@ endif
 
 if HAVE_HOWL
 modlib_LTLIBRARIES += \
+               libhowl-wrap.la \
                module-zeroconf-publish.la
 endif
 
@@ -967,6 +994,9 @@ module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EX
 
 # OSS
 
+liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
+liboss_util_la_LDFLAGS = -avoid-version
+
 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
@@ -977,6 +1007,11 @@ module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.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)
+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
@@ -995,6 +1030,11 @@ module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la
 
 # HOWL
 
+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)
+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
@@ -1024,7 +1064,7 @@ 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)
+module_detect_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 module_detect_la_CFLAGS = $(AM_CFLAGS)
 
 ###################################
@@ -1035,23 +1075,23 @@ suid: polypaudio
        chown root $<
        chmod u+s $<
 
-utils/esdcompat.sh: utils/esdcompat.sh.in Makefile
+esdcompat.sh: daemon/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' < $< > $@
 
-client.conf: client.conf.in Makefile
+client.conf: polyp/client.conf.in Makefile
        sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 
 if OS_IS_WIN32    
-default.pa: default.pa.win32
+default.pa: daemon/default.pa.win32
        cp $< $@
 else
-default.pa: default.pa.in Makefile
+default.pa: daemon/default.pa.in Makefile
        sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 endif
 
-daemon.conf: daemon.conf.in Makefile
+daemon.conf: daemon/daemon.conf.in Makefile
        sed -e 's,@DLSEARCHPATH\@,$(modlibdir),g' \
                -e 's,@DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@