[monkey-bubble: 613/753] After a discussion with Michael and a release meeting, we decided to

[Sven Herzberg <herzi src gnome org>]

commit f3337f52b3d95e15f3d8072169ff190e19cfc120
Author: Martin Baulig <baulig suse de>
Date:   Thu Aug 9 21:08:29 2001 +0000

    After a discussion with Michael and a release meeting, we decided to
    
    2001-08-09  Martin Baulig  <baulig suse de>
    
    	After a discussion with Michael and a release meeting, we
    	decided to remove the sound again. It was really a bad idea.
    
    	* gnome-sound.[ch]: Removed.
    	* gnome-sound-csl.c: Removed.
    	* gnome-sound-driver.[ch]: Removed.
    	* gnome-triggers.[ch]: Removed.
    	* test-sound.c: Removed.

 libgnome/ChangeLog            |   11 +
 libgnome/Makefile.am          |   31 +---
 libgnome/gnome-sound-csl.c    |  407 -------------------------------------
 libgnome/gnome-sound-driver.c |  229 ---------------------
 libgnome/gnome-sound-driver.h |  195 ------------------
 libgnome/gnome-sound.c        |  206 -------------------
 libgnome/gnome-sound.h        |   59 ------
 libgnome/gnome-triggers.c     |  450 -----------------------------------------
 libgnome/gnome-triggers.h     |   85 --------
 libgnome/libgnome.h           |    2 -
 libgnome/test-sound.c         |   69 -------
 11 files changed, 12 insertions(+), 1732 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index d238e1a..58e2a36 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,5 +1,16 @@
 2001-08-09  Martin Baulig  <baulig suse de>
 
+	After a discussion with Michael and a release meeting, we
+	decided to remove the sound again. It was really a bad idea.
+
+	* gnome-sound.[ch]: Removed.
+	* gnome-sound-csl.c: Removed.
+	* gnome-sound-driver.[ch]: Removed.
+	* gnome-triggers.[ch]: Removed.
+	* test-sound.c: Removed.
+
+2001-08-09  Martin Baulig  <baulig suse de>
+
 	* gnome-sound-driver.[ch]: New files.
 	* gnome-sound.c, gnome-sound-csl.c: This is an API rewrite
 	which I did in my local tree, but it's not finished yet and
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 6af8b38..5a10fa4 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -13,8 +13,6 @@ lib_LTLIBRARIES = libgnome-2.la
 
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-soundplugindir = $(libdir)/gnome-2.0/sound-plugins
-
 libincludedir = $(includedir)/gnome/2
 
 libgnomeincludedir = $(includedir)/gnome/2/libgnome
@@ -31,7 +29,6 @@ INCLUDES = \
 	-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"		\
 	-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"		\
 	-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DLIBGNOME_SOUNDPLUGINDIR=\""$(soundplugindir)"\"	\
 	-DVERSION=\""$(VERSION)"\"				\
 	-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"		\
 	-DG_LOG_DOMAIN=\"Gnome\"
@@ -54,8 +51,6 @@ libgnome_src = \
 	libgnometypebuiltins.h	\
 	libgnometypebuiltins.c	\
 	gnome-program.c		\
-	gnome-sound.c		\
-	gnome-triggers.c	\
 	gnome-exec.c		\
 	gnome-url.c		\
 	gnome-util.c		\
@@ -75,10 +70,8 @@ libinclude_HEADERS = \
 
 libgnome_headers = \
 	gnome-program.h		\
-	gnome-sound.h		\
 	gnome-i18n.h		\
 	gnome-exec.h		\
-	gnome-triggers.h 	\
 	gnome-url.h		\
 	gnome-util.h   		\
 	gnome-preferences.h	\
@@ -90,23 +83,6 @@ libgnomeinclude_HEADERS = \
 	libgnometypebuiltins.h	\
 	$(libgnome_headers)
 
-if HAVE_CSL
-cslmodules = gnomesoundplugin_csl.la
-else
-cslmodules =
-endif
-
-soundplugin_LTLIBRARIES = $(cslmodules)
-
-gnomesoundplugin_csl_la_SOURCES = \
-	gnome-sound-csl.c
-
-gnomesoundplugin_csl_la_LIBADD = \
-	$(LIBGNOME_CSL_LIBS)
-
-gnomesoundplugin_csl_la_LDFLAGS = \
-	-export-dynamic -module
-
 # all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
 # versions in the build dir. thus a development setup requires
@@ -189,17 +165,12 @@ libgnome_2_la_LIBADD =		\
 	$(LIBGNOME_LIBS)
 
 noinst_PROGRAMS = \
-	test-libgnome			\
-	test-sound
+	test-libgnome
 
 test_libgnome_SOURCES = test-libgnome.c
 test_libgnome_LDADD = \
 	libgnome-2.la
 
-test_sound_SOURCES = test-sound.c
-test_sound_LDADD = \
-	libgnome-2.la
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgnome-2.0.pc
 
diff --git a/libgnome/libgnome.h b/libgnome/libgnome.h
index 5c9c8f3..c66eb2b 100644
--- a/libgnome/libgnome.h
+++ b/libgnome/libgnome.h
@@ -31,8 +31,6 @@
 
 #include <libgnome/gnome-exec.h>
 
-#include <libgnome/gnome-triggers.h>
-#include <libgnome/gnome-sound.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-url.h>