From: Tim-Philipp Müller Date: Wed, 17 Mar 2010 14:33:35 +0000 (+0000) Subject: Revert "Add srcdir to includes for out-of-source builds" X-Git-Tag: RELEASE-0.10.29~106 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ca329b4e90f91f232baba1f6ceb2fed0f84fe78;p=platform%2Fupstream%2Fgstreamer.git Revert "Add srcdir to includes for out-of-source builds" I don't know how this ever worked, as it seems to put -I./.. and -I./../libs verbatim into the includes, at least with current autotools versions. This reverts commit 279a80ff27ba4c90f52981e89e710eb1181bc201. --- diff --git a/pkgconfig/gstreamer-base-uninstalled.pc.in b/pkgconfig/gstreamer-base-uninstalled.pc.in index e636a91..ef07549 100644 --- a/pkgconfig/gstreamer-base-uninstalled.pc.in +++ b/pkgconfig/gstreamer-base-uninstalled.pc.in @@ -10,4 +10,4 @@ Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: ${libdir}/libgstbase-@GST_MAJORMINOR@.la -Cflags: -I${includedir} -I@srcdir@/.. +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-check-uninstalled.pc.in b/pkgconfig/gstreamer-check-uninstalled.pc.in index 2f5e6d3..16b7a33 100644 --- a/pkgconfig/gstreamer-check-uninstalled.pc.in +++ b/pkgconfig/gstreamer-check-uninstalled.pc.in @@ -10,4 +10,4 @@ Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: ${libdir}/libgstcheck-@GST_MAJORMINOR@.la -lm -Cflags: -I${includedir} -I@srcdir@/.. +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-controller-uninstalled.pc.in b/pkgconfig/gstreamer-controller-uninstalled.pc.in index 40af9f1..6bb9ef0 100644 --- a/pkgconfig/gstreamer-controller-uninstalled.pc.in +++ b/pkgconfig/gstreamer-controller-uninstalled.pc.in @@ -10,4 +10,4 @@ Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: ${libdir}/libgstcontroller-@GST_MAJORMINOR@.la -Cflags: -I${includedir} -I@srcdir@/.. +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in b/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in index 7f0b505..ebee87e 100644 --- a/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in +++ b/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in @@ -10,4 +10,4 @@ Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: ${libdir}/gst/dataprotocol/libgstdataprotocol-@GST_MAJORMINOR@.la -Cflags: -I${includedir} -I@srcdir@/.. -I${includedir}/libs -I@srcdir@/../libs +Cflags: -I${includedir} -I${includedir}/libs diff --git a/pkgconfig/gstreamer-net-uninstalled.pc.in b/pkgconfig/gstreamer-net-uninstalled.pc.in index 4ada69e..62165ce 100644 --- a/pkgconfig/gstreamer-net-uninstalled.pc.in +++ b/pkgconfig/gstreamer-net-uninstalled.pc.in @@ -11,4 +11,4 @@ Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: ${libdir}/libgstnet-@GST_MAJORMINOR@.la -Cflags: -I${includedir} -I@srcdir@/.. +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-uninstalled.pc.in b/pkgconfig/gstreamer-uninstalled.pc.in index fa518cd..3ba1782 100644 --- a/pkgconfig/gstreamer-uninstalled.pc.in +++ b/pkgconfig/gstreamer-uninstalled.pc.in @@ -11,4 +11,4 @@ Description: Streaming media framework, Not Installed Version: @VERSION@ Requires: @GST_PKG_DEPS@@LIBXML_PKG@ Libs: ${libdir}/gst/libgstreamer-@GST_MAJORMINOR@.la -Cflags: -I${includedir} -I@srcdir@/.. -I${includedir}/libs -I@srcdir@/../libs +Cflags: -I${includedir} -I${includedir}/libs