make rename of oss.[ch] to oss-util.[ch] complete

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@35 fefdeb5f-60dc-0310-8127-8f9354f1896f

5 files changed, 11 insertions, 11 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ad1488f..c3a33ce3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,12 +23,12 @@ bin_PROGRAMS = polypaudio pacat
 pkglib_LTLIBRARIES=libiochannel.la libsocket-server.la libsocket-client.la \
 		libprotocol-simple.la module-simple-protocol-tcp.la \
 		module-pipe-sink.la libpstream.la \
-		libpacket.la module-oss.la module-oss-mmap.la liboss.la libioline.la \
+		libpacket.la module-oss.la module-oss-mmap.la liboss-util.la libioline.la \
 		libcli.la module-cli.la libtokenizer.la libdynarray.la \
 		module-simple-protocol-unix.la module-cli-protocol-tcp.la \
 		libprotocol-cli.la module-cli-protocol-unix.la libtagstruct.la \
 		libpdispatch.la libprotocol-native.la libpstream-util.la \
-        module-native-protocol-tcp.la module-native-protocol-unix.la \
+        	module-native-protocol-tcp.la module-native-protocol-unix.la \
 		libpolyp.la
 
 polypaudio_SOURCES = idxset.c idxset.h \
@@ -86,8 +86,8 @@ libiochannel_la_LDFLAGS = -avoid-version
 libpacket_la_SOURCES = packet.c packet.h
 libpacket_la_LDFLAGS = -avoid-version
 
-liboss_la_SOURCES = oss.c oss.h
-liboss_la_LDFLAGS = -avoid-version
+liboss_util_la_SOURCES = oss-util.c oss-util.h
+liboss_util_la_LDFLAGS = -avoid-version
 
 libioline_la_SOURCES = ioline.c ioline.h
 libioline_la_LDFLAGS = -avoid-version
@@ -151,11 +151,11 @@ module_pipe_sink_la_LIBADD = libiochannel.la
 
 module_oss_la_SOURCES = module-oss.c
 module_oss_la_LDFLAGS = -module -avoid-version
-module_oss_la_LIBADD = libiochannel.la liboss.la
+module_oss_la_LIBADD = libiochannel.la liboss-util.la
 
 module_oss_mmap_la_SOURCES = module-oss-mmap.c
 module_oss_mmap_la_LDFLAGS = -module -avoid-version
-module_oss_mmap_la_LIBADD = libiochannel.la liboss.la
+module_oss_mmap_la_LIBADD = libiochannel.la liboss-util.la
 
 module_cli_la_SOURCES = module-cli.c
 module_cli_la_LDFLAGS = -module -avoid-version
diff --git a/src/module-oss-mmap.c b/src/module-oss-mmap.c
index b70ea6bd..f08dd7d3 100644
--- a/src/module-oss-mmap.c
+++ b/src/module-oss-mmap.c
@@ -15,7 +15,7 @@
 #include "sink.h"
 #include "source.h"
 #include "module.h"
-#include "oss.h"
+#include "oss-util.h"
 #include "sample-util.h"
 
 struct userdata {
diff --git a/src/module-oss.c b/src/module-oss.c
index 4f307545..b5d1427a 100644
--- a/src/module-oss.c
+++ b/src/module-oss.c
@@ -14,7 +14,7 @@
 #include "sink.h"
 #include "source.h"
 #include "module.h"
-#include "oss.h"
+#include "oss-util.h"
 #include "sample-util.h"
 
 struct userdata {
diff --git a/src/oss-util.c b/src/oss-util.c
index 02bf8cd1..bf6b62e2 100644
--- a/src/oss-util.c
+++ b/src/oss-util.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "oss.h"
+#include "oss-util.h"
 
 int oss_auto_format(int fd, struct pa_sample_spec *ss) {
     int format, channels, speed;
diff --git a/src/oss-util.h b/src/oss-util.h
index 34ac9c66..5fc08b0b 100644
--- a/src/oss-util.h
+++ b/src/oss-util.h
@@ -1,5 +1,5 @@
-#ifndef fooosshfoo
-#define fooosshfoo
+#ifndef fooossutilhfoo
+#define fooossutilhfoo
 
 #include "sample.h"