First SVN commit. This commit is a hack to make git-rebase work

4 files changed, 51 insertions, 52 deletions

diff --git a/pkgconfig/.cvsignore b/pkgconfig/.cvsignore
deleted file mode 100644
index 6fd0ef0..0000000
--- a/pkgconfig/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pc
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 8dd51ac..20df9ec 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,23 +1,23 @@
-
-pcverfiles = gstreamer-gl-@GST_MAJORMINOR@.pc
-
-pcverfiles_uninstalled = gstreamer-gl-@GST_MAJORMINOR@-uninstalled.pc
-
-all-local: $(pcverfiles) $(pcverfiles_uninstalled)
-
-### how to generate versioned .pc files from .pc files in this dir
-%-@GST_MAJORMINOR@.pc: %.pc
-	cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
-	cp $< $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcverfiles)
-
-CLEANFILES = $(pcverfiles) $(pcverfiles_uninstalled)
-pcinfiles = \
-	gstreamer-gl.pc.in gstreamer-gl-uninstalled.pc.in
-
-DISTCLEANFILES = $(pcinfiles:.in=)
-EXTRA_DIST = $(pcinfiles)
-
+

+pcverfiles = gstreamer-gl-@GST_MAJORMINOR@.pc

+

+pcverfiles_uninstalled = gstreamer-gl-@GST_MAJORMINOR@-uninstalled.pc

+

+all-local: $(pcverfiles) $(pcverfiles_uninstalled)

+

+### how to generate versioned .pc files from .pc files in this dir

+%-@GST_MAJORMINOR@.pc: %.pc

+	cp $< $@

+%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc

+	cp $< $@

+

+pkgconfigdir = $(libdir)/pkgconfig

+pkgconfig_DATA = $(pcverfiles)

+

+CLEANFILES = $(pcverfiles) $(pcverfiles_uninstalled)

+pcinfiles = \

+	gstreamer-gl.pc.in gstreamer-gl-uninstalled.pc.in

+

+DISTCLEANFILES = $(pcinfiles:.in=)

+EXTRA_DIST = $(pcinfiles)

+

diff --git a/pkgconfig/gstreamer-gl-uninstalled.pc.in b/pkgconfig/gstreamer-gl-uninstalled.pc.in
index 14c06a7..ff9b2a3 100644
--- a/pkgconfig/gstreamer-gl-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gl-uninstalled.pc.in
@@ -1,15 +1,15 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst
-includedir=${pcfiledir}/../gst-libs
-pluginsdir=${pcfiledir}/..
-
-Name: GStreamer OpenGL Plugins Libraries, Uninstalled
-Description: Streaming media framework, OpenGL plugins libraries, uninstalled
-Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir}/gl
-Cflags: -I${includedir}
-
-libraries=gl
+prefix=

+exec_prefix=

+libdir=${pcfiledir}/../gst-libs/gst

+includedir=${pcfiledir}/../gst-libs

+pluginsdir=${pcfiledir}/..

+

+Name: GStreamer OpenGL Plugins Libraries, Uninstalled

+Description: Streaming media framework, OpenGL plugins libraries, uninstalled

+Version: @VERSION@

+Requires: gstreamer-@GST_MAJORMINOR@

+

+Libs: -L${libdir}/gl

+Cflags: -I${includedir}

+

+libraries=gl

diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in
index 432b73e..8e219ff 100644
--- a/pkgconfig/gstreamer-gl.pc.in
+++ b/pkgconfig/gstreamer-gl.pc.in
@@ -1,13 +1,13 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
-
-Name: GStreamer OpenGL Plugins Libraries
-Description: Streaming media framework, OpenGL plugins libraries
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
-Version: @VERSION@
-Libs: -L${libdir} -lgstgl-@GST_MAJORMINOR@
-Cflags: -I${includedir}
-
+prefix=@prefix@

+exec_prefix=@exec_prefix@

+libdir=@libdir@

+includedir=@includedir@/gstreamer-@GST_MAJORMINOR@

+pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@

+

+Name: GStreamer OpenGL Plugins Libraries

+Description: Streaming media framework, OpenGL plugins libraries

+Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@

+Version: @VERSION@

+Libs: -L${libdir} -lgstgl-@GST_MAJORMINOR@

+Cflags: -I${includedir}

+