Commit 950ecc5d authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Remove gconf stuff, use gconf elements instead from now on.

Original commit message from CVS:
* 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.
parent ee345636
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:
......
......@@ -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
......
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 \
......
test-gconf
gstreamer-gconf-uninstalled.pc
gstreamer-gconf.pc
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@
/* 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;
}
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=)
......
# 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}
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}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment