diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gst-libs/gst/Makefile.am | 8 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/.gitignore | 3 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/Makefile.am | 20 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/test-gconf.c | 36 | ||||
| -rw-r--r-- | pkgconfig/Makefile.am | 12 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-gconf-uninstalled.pc.in | 13 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-gconf.pc.in | 12 |
9 files changed, 12 insertions, 107 deletions
@@ -1,3 +1,15 @@ +2005-07-20 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * configure.ac: + * gst-libs/gst/Makefile.am: + * gst-libs/gst/gconf/.cvsignore: + * gst-libs/gst/gconf/Makefile.am: + * gst-libs/gst/gconf/test-gconf.c: + * pkgconfig/Makefile.am: + * pkgconfig/gstreamer-gconf-uninstalled.pc.in: + * pkgconfig/gstreamer-gconf.pc.in: + Remove gconf stuff, use gconf elements instead from now on. + 2005-07-20 Wim Taymans <wim@fluendo.com> * gst-libs/gst/audio/TODO: diff --git a/configure.ac b/configure.ac index 43d84d3ee..d967e803a 100644 --- a/configure.ac +++ b/configure.ac @@ -915,7 +915,6 @@ gst-libs/Makefile gst-libs/gst/Makefile gst-libs/gst/audio/Makefile gst-libs/gst/floatcast/Makefile -gst-libs/gst/gconf/Makefile gst-libs/gst/interfaces/Makefile gst-libs/gst/net/Makefile gst-libs/gst/riff/Makefile @@ -929,8 +928,6 @@ tools/Makefile gconf/Makefile gconf/gstreamer.schemas pkgconfig/Makefile -pkgconfig/gstreamer-gconf.pc -pkgconfig/gstreamer-gconf-uninstalled.pc pkgconfig/gstreamer-plugins-base.pc pkgconfig/gstreamer-plugins-base-uninstalled.pc docs/Makefile diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index ac0d572ac..41213767f 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 42a2ba586..000000000 --- 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 f816f946d..000000000 --- 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 bfc8cabc1..000000000 --- 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; -} diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 072251068..c5c6e0191 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -1,20 +1,9 @@ -if USE_GCONF -GCONF_PC=gstreamer-gconf-@GST_MAJORMINOR@.pc -GCONF_PC_UNINSTALLED=gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc -else -GCONF_PC= -GCONF_PC_UNINSTALLED= -endif - ### all of the standard pc files we need to generate pcverfiles = \ - $(GCONF_PC) \ gstreamer-plugins-base-@GST_MAJORMINOR@.pc pcverfiles_uninstalled = \ - $(GCONF_PC_UNINSTALLED) \ gstreamer-plugins-base-@GST_MAJORMINOR@-uninstalled.pc -pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED) all-local: $(pcverfiles) $(pcverfiles_uninstalled) ### how to generate versioned .pc files from .pc files in this dir @@ -28,7 +17,6 @@ pkgconfig_DATA = $(pcverfiles) CLEANFILES = $(pcverfiles) $(pcverfiles_uninstalled) pcinfiles = \ - gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in \ gstreamer-plugins-base.pc.in gstreamer-plugins-base-uninstalled.pc.in DISTCLEANFILES = $(pcinfiles:.in=) diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in deleted file mode 100644 index 752cf123c..000000000 --- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/gconf -includedir=${pcfiledir}/../gst-libs - -Name: GStreamer GConf Library, uninstalled -Description: Streaming-media framework, GConf support library, not installed -Requires: gstreamer-@GST_MAJORMINOR@ gconf-2.0 -Version: @VERSION@ - -Libs: ${libdir}/libgstgconf-@GST_MAJORMINOR@.la -Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-gconf.pc.in b/pkgconfig/gstreamer-gconf.pc.in deleted file mode 100644 index 54754f6b4..000000000 --- a/pkgconfig/gstreamer-gconf.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ - -Name: GStreamer GConf Library -Description: Streaming-media framework, GConf support library -Requires: gstreamer-@GST_MAJORMINOR@ gconf-2.0 -Version: @VERSION@ - -Libs: -L${libdir} -lgstgconf-@GST_MAJORMINOR@ -Cflags: -I${includedir} |