summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-30 22:58:12 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-30 22:58:12 +0000
commit241ad047c889755d4b0003f8d149e8aed4639ae9 (patch)
tree67b191057bc847c4186e5ab822b67bb3f3ea9ad7 /src/Makefile.am
parent4d623f0d4442148f20f2ffdc85cf95e54ef83721 (diff)
port module-combine to new core
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1734 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0bdc3f79..079610ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -930,8 +930,8 @@ modlibexec_LTLIBRARIES += \
module-sine.la \
module-native-protocol-tcp.la \
module-native-protocol-fd.la \
- module-esound-protocol-tcp.la
-# module-combine.la \
+ module-esound-protocol-tcp.la \
+ module-combine.la
# module-tunnel-sink.la \
# module-tunnel-source.la \
# module-esound-sink.la
@@ -1192,9 +1192,9 @@ module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la
# Couplings
-#module_combine_la_SOURCES = modules/module-combine.c
-#module_combine_la_LDFLAGS = -module -avoid-version
-#module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+module_combine_la_SOURCES = modules/module-combine.c
+module_combine_la_LDFLAGS = -module -avoid-version
+module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
module_match_la_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = -module -avoid-version