diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-09-14 17:52:11 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-09-14 17:52:11 +0000 |
| commit | 8c6593dabf3253e20fead143855267570a403c9a (patch) | |
| tree | 46ab7f2f77375113d2e8f0461a512688b0aa8857 /polyp/Makefile.am | |
| parent | 829656c5fcd7169e4c2f86f4ad5098ea9aaa5643 (diff) | |
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
Diffstat (limited to 'polyp/Makefile.am')
| -rw-r--r-- | polyp/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/polyp/Makefile.am b/polyp/Makefile.am index e9e1c295..9c672a3b 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -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 \ |