4 files changed, 0 insertions, 67 deletions
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index ac0d572ace..41213767fb 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -1,13 +1,6 @@
-if USE_GCONF
-GCONF_DIR = gconf
-else
-GCONF_DIR =
-endif
-
 SUBDIRS = \
 	audio \
 	floatcast \
-	$(GCONF_DIR) \
 	interfaces \
 	net \
 	riff \
@@ -18,7 +11,6 @@ SUBDIRS = \
 DIST_SUBDIRS = \
 	audio \
 	floatcast \
-	gconf \
 	interfaces \
 	net \
 	riff \
diff --git a/gst-libs/gst/gconf/.gitignore b/gst-libs/gst/gconf/.gitignore
deleted file mode 100644
index 42a2ba5866..0000000000
--- a/gst-libs/gst/gconf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-test-gconf
-gstreamer-gconf-uninstalled.pc
-gstreamer-gconf.pc
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
deleted file mode 100644
index f816f946d1..0000000000
--- a/gst-libs/gst/gconf/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-librarydir = $(libdir)
-
-library_LTLIBRARIES = libgstgconf-@GST_MAJORMINOR@.la
-
-libgstgconf_@GST_MAJORMINOR@_la_SOURCES = gconf.c
-
-libgstgconf_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gconf
-libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
-
-noinst_PROGRAMS = test-gconf
-
-# add define for GST_GCONF_DIR
-DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
-
-test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
-test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
-
-libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
-libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
-libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
diff --git a/gst-libs/gst/gconf/test-gconf.c b/gst-libs/gst/gconf/test-gconf.c
deleted file mode 100644
index bfc8cabc1f..0000000000
--- a/gst-libs/gst/gconf/test-gconf.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* GStreamer
- * Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "gconf.h"
-
-int
-main (int argc, char *argv[])
-{
-  gst_init (&argc, &argv);
-
-  printf ("Default video sink : %s\n",
-      gst_gconf_get_string ("default/videosink"));
-  printf ("Default audio sink : %s\n",
-      gst_gconf_get_string ("default/audiosink"));
-  printf ("Default video src : %s\n",
-      gst_gconf_get_string ("default/videosrc"));
-  printf ("Default audio src : %s\n",
-      gst_gconf_get_string ("default/audiosrc"));
-  return 0;
-}