From bb3ad9d38e2be840838b6af5dc2a09e4863566ed Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 23 Jun 2007 20:05:20 +0000 Subject: Update OSS driver for new lock-free core git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1491 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 0a5d5297..a83424ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -927,12 +927,12 @@ modlibexec_LTLIBRARIES += \ module-x11-publish.la endif -#if HAVE_OSS -#modlibexec_LTLIBRARIES += \ -# liboss-util.la \ -# module-oss.la \ +if HAVE_OSS +modlibexec_LTLIBRARIES += \ + liboss-util.la \ + module-oss.la # module-oss-mmap.la -#endif +endif #if HAVE_ALSA #modlibexec_LTLIBRARIES += \ @@ -1176,13 +1176,13 @@ module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EX # OSS -#liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h -#liboss_util_la_LDFLAGS = -avoid-version -#liboss_util_la_LIBADD = libpulsecore.la +liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h +liboss_util_la_LDFLAGS = -avoid-version +liboss_util_la_LIBADD = libpulsecore.la -#module_oss_la_SOURCES = modules/module-oss.c -#module_oss_la_LDFLAGS = -module -avoid-version -#module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la +module_oss_la_SOURCES = modules/module-oss.c +module_oss_la_LDFLAGS = -module -avoid-version +module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la #module_oss_mmap_la_SOURCES = modules/module-oss-mmap.c #module_oss_mmap_la_LDFLAGS = -module -avoid-version -- cgit