summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--pkgconfig/gstreamer-gconf-uninstalled.pc.in10
-rw-r--r--pkgconfig/gstreamer-interfaces-uninstalled.pc.in10
-rw-r--r--pkgconfig/gstreamer-libs-uninstalled.pc.in16
-rw-r--r--pkgconfig/gstreamer-play-uninstalled.pc.in11
5 files changed, 37 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index eed814dcc..aa5647c49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-05 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc.in:
+ * pkgconfig/gstreamer-interfaces-uninstalled.pc.in:
+ * pkgconfig/gstreamer-libs-uninstalled.pc.in:
+ * pkgconfig/gstreamer-play-uninstalled.pc.in:
+ reworked patch by David Lehn to fix libdir and includedir for
+ uninstalled libraries
+ removed play and gconf from gstreamer-libs since they have their
+ own pkgconfig files
+
2004-02-04 David Schleef <ds@schleef.org>
* gst/wavparse/gstwavparse.c: (gst_wavparse_parse_fmt): Fix a caps
diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
index ad3439b48..1255a6bfc 100644
--- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -1,13 +1,13 @@
# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
-libdir=${pcfiledir}
-includedir=${pcfiledir}
+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 >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
Version: @VERSION@
-Libs: ${pcfiledir}/../gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/../gst-libs
+Libs: ${libdir}/libgstgconf-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 1637411b6..3c1665f63 100644
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -1,13 +1,13 @@
# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
-libdir=${pcfiledir}
-includedir=${pcfiledir}
+libdir=${pcfiledir}/../gst-libs/gst
+includedir=${pcfiledir}/../gst-libs
Name: GStreamer Interfaces library, uninstalled
Description: Streaming-media framework, interfaces library, not installed
-Requires: gstreamer >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
Version: @VERSION@
-Libs: ${pcfiledir}/../gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/../gst-libs
+Libs: ${libdir}/libgstinterfaces-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 3ce3d6d4f..79a949b10 100644
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -1,9 +1,13 @@
+# the standard variables don't make sense for an uninstalled copy
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/../gst-libs/gst
+includedir=${pcfiledir}/../gst-libs
+
Name: GStreamer Uninstalled Media-Specific Libraries
Description: Streaming-media framework media-specific libraries, not installed
Version: @VERSION@
-Requires: gstreamer = @VERSION@
-Libs: -L${pcfiledir}/../gst-libs/gst/gconf \
- -L${pcfiledir}/../gst-libs/gst/audio \
- -L${pcfiledir}/../gst-libs/gst/video \
- -L${pcfiledir}/../gst-libs/gst/play
-Cflags: -I${pcfiledir}/../gst-libs
+Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
+
+Libs: -L${libdir}/audio -L${libdir}/video
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 6bc27e77e..7d77ee82d 100644
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -1,13 +1,14 @@
# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
-libdir=${pcfiledir}
-includedir=${pcfiledir}
+libdir=${pcfiledir}/../gst-libs/gst/play
+includedir=${pcfiledir}/../gst-libs
Name: GStreamer Play Library, uninstalled
Description: Streaming-media framework, play libraries, not installed
-Requires: gstreamer >= @VERSION@ gstreamer-control >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@ \
+ gstreamer-control-@GST_MAJORMINOR@ >= @VERSION@
Version: @VERSION@
-Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/../gst-libs
+Libs: ${libdir}/libgstplay-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}