diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2009-07-29 11:56:43 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2009-07-29 11:56:43 +0100 |
| commit | db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab (patch) | |
| tree | 1c44875eea65b123dac43de2bb0ed4d6bac514ec | |
| parent | b0b09568add1cac26e37c8a6b0e252ba924cb7a0 (diff) | |
| download | clutter-gst-db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab.tar.gz | |
[build] Fix pc file generation and headers' location0.10.0
Depending on clutter-0.9 API was hardcoded in the .pc file generation
and include file path. A new clutter_api_version variable in the
configure.ac file is there to fix that.
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | clutter-gst.pc.in | 4 | ||||
| -rw-r--r-- | clutter-gst/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 0641dff..6b19eba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,15 +10,15 @@ DIST_SUBDIRS = build scripts clutter-gst tests examples doc ACLOCAL_AMFLAGS = -I build/autotools -clutter-gst-0.9.pc: clutter-gst.pc - $(QUIET_GEN)cp -f clutter-gst.pc clutter-gst-0.9.pc +clutter-gst-$(CLUTTER_GST_API_VERSION).pc: clutter-gst.pc + $(QUIET_GEN)cp -f clutter-gst.pc $@ -pkgconfig_DATA = clutter-gst-0.9.pc +pkgconfig_DATA = clutter-gst-$(CLUTTER_GST_API_VERSION).pc pkgconfigdir = $(libdir)/pkgconfig EXTRA_DIST = clutter-gst.pc.in -CLEANFILES = clutter-gst.pc clutter-gst-0.9.pc +CLEANFILES = clutter-gst.pc clutter-gst-$(CLUTTER_GST_API_VERSION).pc DISTCLEANFILES = doltcompile doltlibtool diff --git a/clutter-gst.pc.in b/clutter-gst.pc.in index 6ea9e0a..845aa86 100644 --- a/clutter-gst.pc.in +++ b/clutter-gst.pc.in @@ -7,5 +7,5 @@ Name: clutter-gst Description: Clutter GStreamer integration Version: @VERSION@ Libs: -L${libdir} -lclutter-gst-@CLUTTER_GST_MAJORMINOR@ -Cflags: -I${includedir}/clutter-0.9 -Requires: clutter-0.9 gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10 +Cflags: -I${includedir}/clutter-@CLUTTER_API_VERSION@ +Requires: clutter-@CLUTTER_API_VERSION@ gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10 diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 8f85b7f..f4b843d 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -35,5 +35,5 @@ lib_LTLIBRARIES = libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LIBADD = @CLUTTER_GST_LIBS@ $(GST_LIBS) libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = @CLUTTER_GST_LT_LDFLAGS@ -cluttergstheadersdir = $(includedir)/clutter-0.9/clutter-gst +cluttergstheadersdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter-gst cluttergstheaders_HEADERS = $(source_h) clutter-gst.h diff --git a/configure.ac b/configure.ac index 19bbe3c..e1410ad 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,8 @@ m4_define(clutter_gst_major_version, 0) m4_define(clutter_gst_minor_version, 10) m4_define(clutter_gst_micro_version, 0) +m4_define(clutter_api_version, 1.0) + m4_define([clutter_gst_version], [clutter_gst_major_version.clutter_gst_minor_version.clutter_gst_micro_version]) @@ -33,12 +35,14 @@ CLUTTER_GST_MICRO_VERSION=clutter_gst_micro_version CLUTTER_GST_VERSION=clutter_gst_version CLUTTER_GST_API_VERSION=clutter_gst_api_version CLUTTER_GST_MAJORMINOR=clutter_gst_api_version +CLUTTER_API_VERSION=clutter_api_version AC_SUBST(CLUTTER_GST_MAJOR_VERSION) AC_SUBST(CLUTTER_GST_MINOR_VERSION) AC_SUBST(CLUTTER_GST_MICRO_VERSION) AC_SUBST(CLUTTER_GST_VERSION) AC_SUBST(CLUTTER_GST_API_VERSION) AC_SUBST(CLUTTER_GST_MAJORMINOR) +AC_SUBST(CLUTTER_API_VERSION) m4_define([lt_current], [m4_eval(100 * clutter_gst_minor_version + clutter_gst_micro_version - clutter_gst_interface_age)]) |