* 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 443a9793914a620504ad4af24269ff097bc553ea..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)\"
 
@@ -180,7 +180,9 @@ noinst_PROGRAMS = \
                pacat-simple \
                parec-simple \
                strlist-test \
-               voltest
+               voltest \
+               memblockq-test \
+               sync-playback
 
 if HAVE_SIGXCPU
 noinst_PROGRAMS += \
@@ -248,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          #
 ###################################
@@ -330,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 \
@@ -1043,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)
 
 ###################################