diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-07-12 16:43:57 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-07-12 16:43:57 +0100 |
| commit | d940953f81ada163d61f7929b1c2aab1d871fcf1 (patch) | |
| tree | d594e6ce5b23546d5ffa62ad6acaad5d4e6898b9 | |
| parent | 5c35847aa5648695db717aec54d44e54e77063c1 (diff) | |
Make clutter-gst for GStreamer 1.0 parallel installable
We need to be able to ship both the GStreamer 0.10 and the GStreamer
1.0 versions of clutter-gst, and have them not clash.
We used to install clutter-gst in a clutter-1.0 directory, but only
the GStreamer API version changed, not the clutter one, so we need to
move the includes to $(includedir)/clutter-gst-2.0/
https://bugzilla.gnome.org/show_bug.cgi?id=674077
| -rw-r--r-- | clutter-gst.pc.in | 2 | ||||
| -rw-r--r-- | clutter-gst/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/clutter-gst.pc.in b/clutter-gst.pc.in index 413666b..113579a 100644 --- a/clutter-gst.pc.in +++ b/clutter-gst.pc.in @@ -7,6 +7,6 @@ Name: clutter-gst Description: Clutter GStreamer integration Version: @VERSION@ Libs: -L${libdir} -lclutter-gst-@CLUTTER_GST_MAJORMINOR@ -Cflags: -I${includedir}/clutter-@CLUTTER_API_VERSION@ +Cflags: -I${includedir}/clutter-gst-@CLUTTER_GST_API_VERSION@ Requires: clutter-@CLUTTER_API_VERSION@ >= 1.3.12 gstreamer-1.0 gstreamer-base-1.0 gstreamer-plugins-base-1.0 Requires.private: gio-2.0 diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 9a0f7d6..65cb5e9 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -88,7 +88,7 @@ libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = \ -rpath $(libdir) $(NULL) -cluttergstheadersdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter-gst +cluttergstheadersdir = $(includedir)/clutter-gst-@CLUTTER_GST_API_VERSION@/clutter-gst cluttergstheaders_HEADERS = $(source_h) $(glib_enum_h) # diff --git a/configure.ac b/configure.ac index 209d7e8..e98ad30 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ m4_define(clutter_gst_minor_version, 6) m4_define(clutter_gst_micro_version, 1) m4_define(clutter_api_version, 1.0) -m4_define([clutter_gst_api_version], [1.0]) +m4_define([clutter_gst_api_version], [2.0]) m4_define([clutter_gst_version], [clutter_gst_major_version.clutter_gst_minor_version.clutter_gst_micro_version]) |