[clutter-gst] build: find Gst-1.0.gir file properly again
- From: Tim-Philipp MÃller <tpm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter-gst] build: find Gst-1.0.gir file properly again
- Date: Mon, 30 Jul 2012 17:27:05 +0000 (UTC)
commit 496285c48b3c6c8a8fe71362f57b2297c6227a48
Author: Tim-Philipp MÃller <tim centricular net>
Date: Mon Jul 30 18:24:06 2012 +0100
build: find Gst-1.0.gir file properly again
We were looking for a "gstreamer-2.0" pkg-config
module now.
Fixes build against uninstalled GStreamer 1.0 and
GStreamer 1.0 in a different prefix.
clutter-gst/Makefile.am | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index 65cb5e9..cd67998 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -133,13 +133,13 @@ ClutterGst- CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
--c-include="clutter-gst/clutter-gst.h" \
--include=GObject-2.0 \
--include=Clutter-1.0 \
- --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer- CLUTTER_GST_API_VERSION@` \
+ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
--include=Gst-1.0 \
- --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base- CLUTTER_GST_API_VERSION@` \
+ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-1.0` \
--include=GstBase-1.0 \
- --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-video- CLUTTER_GST_API_VERSION@` \
+ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-video-1.0` \
--include=GstVideo-1.0 \
- --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-audio- CLUTTER_GST_API_VERSION@` \
+ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-audio-1.0` \
--include=GstAudio-1.0 \
--add-init-section="clutter_gst_init(0,NULL);" \
--library=libclutter-gst- CLUTTER_GST_API_VERSION@.la \
@@ -167,10 +167,10 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
$(QUIET_GEN)$(INTROSPECTION_COMPILER) \
--includedir=$(srcdir) \
--includedir=. \
- --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer- CLUTTER_GST_API_VERSION@` \
- --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base- CLUTTER_GST_API_VERSION@` \
- --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-video- CLUTTER_GST_API_VERSION@` \
- --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-audio- CLUTTER_GST_API_VERSION@` \
+ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
+ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-1.0` \
+ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-video-1.0` \
+ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-audio-1.0` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]