From f8cbde54dab2783e2c6ba699dfaee9ef51b1e098 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 6 Jul 2004 00:08:44 +0000
Subject: auth support in esound and native AUTH and SET_NAME operatins in
 native simple library

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@51 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/Makefile.am | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 62b1a3a6..70e7e09b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@
 
 AM_CFLAGS=-ansi -D_GNU_SOURCE
 
-bin_PROGRAMS = polypaudio pacat
+bin_PROGRAMS = polypaudio pacat pacat-simple
 
 pkglib_LTLIBRARIES=libiochannel.la \
 		libsocket-server.la \
@@ -34,6 +34,7 @@ pkglib_LTLIBRARIES=libiochannel.la \
 		libtagstruct.la \
 		libpstream-util.la \
 		libpdispatch.la \
+		libauthkey.la \
 		libprotocol-simple.la \
 		libprotocol-esound.la \
 		libprotocol-native.la \
@@ -49,7 +50,9 @@ pkglib_LTLIBRARIES=libiochannel.la \
 		module-esound-protocol-unix.la \
 		module-native-protocol-tcp.la \
 		module-native-protocol-unix.la \
-		libpolyp.la
+		libpolyp.la \
+		libpolyp-simple.la \
+		libpolyp-error.la
 
 polypaudio_SOURCES = idxset.c idxset.h \
 		queue.c queue.h \
@@ -139,14 +142,17 @@ libprotocol_cli_la_LIBADD = libsocket-server.la libiochannel.la libcli.la
 
 libprotocol_native_la_SOURCES = protocol-native.c protocol-native.h
 libprotocol_native_la_LDFLAGS = -avoid-version
-libprotocol_native_la_LIBADD = libsocket-server.la libiochannel.la libpacket.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la
+libprotocol_native_la_LIBADD = libsocket-server.la libiochannel.la libpacket.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la
 
 libtagstruct_la_SOURCES = tagstruct.c tagstruct.h
 libtagstruct_la_LDFLAGS = -avoid-version
 
 libprotocol_esound_la_SOURCES = protocol-esound.c protocol-esound.h protocol-esound-spec.h
 libprotocol_esound_la_LDFLAGS = -avoid-version
-libprotocol_esound_la_LIBADD = libsocket-server.la libiochannel.la
+libprotocol_esound_la_LIBADD = libsocket-server.la libiochannel.la libauthkey.la
+
+libauthkey_la_SOURCES = authkey.c authkey.h
+libauthkey_la_LDFLAGS = -avoid-version
 
 module_simple_protocol_tcp_la_SOURCES = module-protocol-stub.c
 module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
@@ -221,7 +227,22 @@ libpolyp_la_SOURCES = polyp.c polyp.h \
 		packet.c packet.h \
 		queue.c queue.h \
 		dynarray.c dynarray.h \
-		memchunk.c memchunk.h
+		memchunk.c memchunk.h \
+		authkey.c authkey.h
+libpolyp_la_CFLAGS = $(AM_CFLAGS)
+#libpolyp_la_LIBADD = libpolyp-error.la
+
+libpolyp_error_la_SOURCES = polyp-error.c polyp-error.h
+libpolyp_error_la_CFLAGS = $(AM_CFLAGS)
 
-pacat_SOURCES = pacat.c
+libpolyp_simple_la_SOURCES = simple.c simple.h 
+libpolyp_simple_la_CFLAGS = $(AM_CFLAGS)
+libpolyp_simple_la_LIBADD = libpolyp.la #libpolyp-error.la
+
+pacat_SOURCES = pacat.c       #$(libpolyp_la_SOURCES)
 pacat_LDADD = libpolyp.la
+pacat_CFLAGS = $(AM_CFLAGS) 
+
+pacat_simple_SOURCES = pacat-simple.c
+pacat_simple_LDADD = libpolyp-simple.a
+pacat_simple_CFLAGS = $(AM_CFLAGS)
-- 
cgit