some more work on the cli

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@24 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 17 insertions, 10 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5afc5bc0..9ec640c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = polypaudio
 pkglib_LTLIBRARIES=libprotocol-simple.la module-simple-protocol-tcp.la \
 		libsocket-server.la module-pipe-sink.la libpstream.la libiochannel.la \
 		libpacket.la module-oss.la module-oss-mmap.la liboss.la libioline.la \
-		libcli.la module-cli.la
+		libcli.la module-cli.la libtokenizer.la libdynarray.la
 
 polypaudio_SOURCES = idxset.c idxset.h \
 		queue.c queue.h \
@@ -45,35 +45,42 @@ polypaudio_INCLUDES = $(INCLTDL)
 polypaudio_LDADD = $(LIBLTDL) 
 polypaudio_LDFLAGS=-export-dynamic
 
-libprotocol_simple_la_SOURCES = protocol-simple.c
+libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
 libprotocol_simple_la_LIBADD = libsocket-server.la libiochannel.la
 
-libsocket_server_la_SOURCES = socket-server.c
+libsocket_server_la_SOURCES = socket-server.c socket-server.h
 libsocket_server_la_LDFLAGS = -avoid-version
 libsocket_server_la_LIBADD = libiochannel.la
 
-libpstream_la_SOURCES = pstream.c
+libpstream_la_SOURCES = pstream.c pstream.h
 libpstream_la_LDFLAGS = -avoid-version
 libpstream_la_LIBADD = libpacket.la
 
-libiochannel_la_SOURCES = iochannel.c
+libiochannel_la_SOURCES = iochannel.c iochannel.h
 libiochannel_la_LDFLAGS = -avoid-version
 
-libpacket_la_SOURCES = packet.c
+libpacket_la_SOURCES = packet.c packet.h
 libpacket_la_LDFLAGS = -avoid-version
 
-liboss_la_SOURCES = oss.c
+liboss_la_SOURCES = oss.c oss.h
 liboss_la_LDFLAGS = -avoid-version
 
-libioline_la_SOURCES = ioline.c
+libioline_la_SOURCES = ioline.c ioline.h
 libioline_la_LDFLAGS = -avoid-version
 libioline_la_LIBADD = libiochannel.la
 
-libcli_la_SOURCES = cli.c
+libcli_la_SOURCES = cli.c cli.h
 libcli_la_LDFLAGS = -avoid-version
 libcli_la_LIBADD = libiochannel.la libioline.la
 
+libdynarray_la_SOURCES = dynarray.c dynarray.h
+libdynarray_la_LDFLAGS = -avoid-version
+
+libtokenizer_la_SOURCES = tokenizer.c tokenizer.h
+libtokenizer_la_LDFLAGS = -avoid-version
+libtokenizer_la_LIBADD = libdynarray.la
+
 module_simple_protocol_tcp_la_SOURCES = module-simple-protocol-tcp.c
 module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version
 module_simple_protocol_tcp_la_LIBADD = libprotocol-simple.la libiochannel.la
@@ -92,4 +99,4 @@ module_oss_mmap_la_LIBADD = libiochannel.la liboss.la
 
 module_cli_la_SOURCES = module-cli.c
 module_cli_la_LDFLAGS = -module -avoid-version
-module_cli_la_LIBADD = libcli.la libiochannel.la
+module_cli_la_LIBADD = libcli.la libiochannel.la libtokenizer.la