diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-20 10:12:34 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-20 10:12:34 +0000 |
| commit | 950ecc5d5f0a03ce8490f0d2d5d57d83e3d7f72c (patch) | |
| tree | eb6d8dc4fadea6b6246dad322a4a06fb014a491c /pkgconfig | |
| parent | ee345636bc33b18337d2e935a399d9216a44fde6 (diff) | |
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.
Diffstat (limited to 'pkgconfig')
| -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 |
3 files changed, 0 insertions, 37 deletions
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} |