add module-combine

remove option "stay-root"
clean up pa_conf


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@199 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-09-14 17:52:11 +00:00
parent 829656c5fc
commit 8c6593dabf
21 changed files with 469 additions and 81 deletions

View file

@ -101,7 +101,8 @@ modlib_LTLIBRARIES= \
module-native-protocol-tcp.la \
module-native-protocol-unix.la \
module-native-protocol-fd.la \
module-sine.la
module-sine.la \
module-combine.la
lib_LTLIBRARIES= \
libpolyp-@PA_MAJORMINOR@.la \
@ -295,6 +296,10 @@ module_sine_la_SOURCES = module-sine.c
module_sine_la_LDFLAGS = -module -avoid-version
module_sine_la_LIBADD = $(AM_LIBADD)
module_combine_la_SOURCES = module-combine.c
module_combine_la_LDFLAGS = -module -avoid-version
module_combine_la_LIBADD = $(AM_LIBADD)
libpolyp_@PA_MAJORMINOR@_la_SOURCES = polyplib.h \
polyplib-def.h \
tagstruct.c tagstruct.h \