Documentation work

[pulseaudio] / polyp / Makefile.am

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index c0be8ce0818b5dadcf03b880882e50e536aeaf70..791abf0ec2452fd04aeace1bdefa86728106138d 100644 (file)
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -18,21 +18,31 @@
 # USA.
 
 AM_CFLAGS=-ansi -D_GNU_SOURCE -DDLSEARCHDIR=\"$(pkglibdir)\" -I$(srcdir)/..
-AM_LDADD=-L.
-AM_LIBADD=-L.
+AM_LDADD=-L. -lpthread
+AM_LIBADD=-L. -lpthread
+
+polypincludedir=$(includedir)/polyp
 
 EXTRA_DIST = polypaudio.pa depmod.py
 bin_PROGRAMS = polypaudio pacat pactl
-noinst_PROGRAMS = pacat-simple parec-simple
+noinst_PROGRAMS = mainloop-test mainloop-test-glib pacat-simple parec-simple 
 
-pkginclude_HEADERS=polyplib.h \
+polypinclude_HEADERS=polyplib.h \
                polyplib-def.h \
                polyplib-simple.h \
                polyplib-error.h \
+               polyplib-stream.h \
+               polyplib-context.h \
+               polyplib-introspect.h \
+               polyplib-subscribe.h \
+               polyplib-operation.h \
+               polyplib-scache.h \
+               cdecl.h \
                mainloop-api.h \
                mainloop.h \
                mainloop-signal.h \
-               sample.h
+               sample.h \
+               glib-mainloop.h
 
 pkglib_LTLIBRARIES=libiochannel.la \
                libsocket-server.la \
@@ -69,10 +79,10 @@ pkglib_LTLIBRARIES=libiochannel.la \
                module-x11-bell.la
 
 lib_LTLIBRARIES=libpolyp.la \
-               libpolyp-simple.la \
                libpolyp-error.la \
                libpolyp-mainloop.la \
-               libpolyp-mainloop-glib.la
+               libpolyp-mainloop-glib.la \
+               libpolyp-simple.la
 
 polypaudio_SOURCES = idxset.c idxset.h \
                queue.c queue.h \
@@ -105,14 +115,16 @@ polypaudio_SOURCES = idxset.c idxset.h \
                modargs.c modargs.h \
                cmdline.c cmdline.h \
                cli-command.c cli-command.h \
-               clitext.c clitext.h \
+               cli-text.c cli-text.h \
                tokenizer.c tokenizer.h \
                dynarray.c dynarray.h \
                scache.c scache.h \
                sound-file.c sound-file.h \
                play-memchunk.c play-memchunk.h \
                autoload.c autoload.h \
-               xmalloc.c xmalloc.h
+               xmalloc.c xmalloc.h \
+               subscribe.h subscribe.c \
+               debug.h
 
 polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
 polypaudio_INCLUDES = $(INCLTDL)
@@ -257,7 +269,7 @@ module_x11_bell_la_SOURCES = module-x11-bell.c
 module_x11_bell_la_LDFLAGS = -module -avoid-version
 module_x11_bell_la_LIBADD = $(AM_LIBADD) -lX11 -L/usr/X11R6/lib
 
-libpolyp_la_SOURCES = polyplib.c polyplib.h \
+libpolyp_la_SOURCES = polyplib.h \
                polyplib-def.h \
                tagstruct.c tagstruct.h \
                iochannel.c iochannel.h \
@@ -277,16 +289,26 @@ libpolyp_la_SOURCES = polyplib.c polyplib.h \
                socket-util.c socket-util.h \
                native-common.h \
                sample.c sample.h \
-               xmalloc.c xmalloc.h
+               xmalloc.c xmalloc.h \
+               polyplib-operation.c polyplib-operation.h \
+               polyplib-context.c polyplib-context.h \
+               polyplib-stream.c polyplib-stream.h \
+               polyplib-introspect.c polyplib-introspect.h \
+               polyplib-scache.c polyplib-scache.h \
+               polyplib-subscribe.c polyplib-subscribe.h \
+               cdecl.h \
+               llist.h
 libpolyp_la_CFLAGS = $(AM_CFLAGS)
 
 libpolyp_mainloop_la_SOURCES = mainloop-api.h mainloop-api.c \
                mainloop.c mainloop.h \
                mainloop-signal.c mainloop-signal.h
 libpolyp_mainloop_la_CFLAGS = $(AM_CFLAGS)
+libpolyp_mainloop_la_LIBADD = $(AM_LIBADD) libpolyp.la
 
 libpolyp_error_la_SOURCES = polyplib-error.c polyplib-error.h
 libpolyp_error_la_CFLAGS = $(AM_CFLAGS)
+libpolyp_error_la_LIBADD = $(AM_LIBADD) libpolyp.la
 
 libpolyp_simple_la_SOURCES = polyplib-simple.c polyplib-simple.h 
 libpolyp_simple_la_CFLAGS = $(AM_CFLAGS)
@@ -301,20 +323,28 @@ pactl_LDADD = $(AM_LDADD) libpolyp.la libpolyp-error.la libpolyp-mainloop.la $(L
 pactl_CFLAGS = $(AM_CFLAGS) $(LIBSDNFILE_CFLAGS)
 
 pacat_simple_SOURCES = pacat-simple.c
-pacat_simple_LDADD = $(AM_LDADD) libpolyp-simple.la libpolyp-error.la
+pacat_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la libpolyp-error.la
 pacat_simple_CFLAGS = $(AM_CFLAGS)
 
 parec_simple_SOURCES = parec-simple.c
-parec_simple_LDADD = $(AM_LDADD) libpolyp-simple.la libpolyp-error.la
+parec_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la libpolyp-error.la
 parec_simple_CFLAGS = $(AM_CFLAGS)
 
 libpolyp_mainloop_glib_la_SOURCES = glib-mainloop.h glib-mainloop.c
 libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
 libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB20_LIBS)
 
+mainloop_test_SOURCES = mainloop-test.c
+mainloop_test_CFLAGS = $(AM_CFLAGS)
+mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la libpolyp.la
+
+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
+
 if BUILD_LIBPOLYPCORE
 
-pkginclude_HEADERS+=cli-command.h\
+polypinclude_HEADERS+=cli-command.h\
                client.h \
                core.h \
                dynarray.h \
@@ -375,8 +405,9 @@ libpolypcore_la_SOURCES = idxset.c idxset.h \
                sioman.c sioman.h \
                modargs.c modargs.h \
                cli-command.c cli-command.h \
-               clitext.c clitext.h \
+               cli-text.c cli-text.h \
                tokenizer.c tokenizer.h \
                dynarray.c dynarray.h
 
 endif
+