[build] Use symbolic values for clutter-gtk version

We should be using CLUTTER_GTK_API_VERSION instead of hardcoding 0.9
or using MAJOR.MINOR explicitly.

diff --git a/Makefile.am b/Makefile.am
index e84e9d7..5c1720a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,13 @@ QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
 
 SUBDIRS = build clutter-gtk doc examples
 
-clutter-gtk-0.9.pc: clutter-gtk.pc
-       $(QUIET_GEN)cp -f clutter-gtk.pc clutter-gtk-0.9.pc
+clutter-gtk-@CLUTTER_GTK_API_VERSION@.pc: clutter-gtk.pc
+       $(QUIET_GEN)cp -f clutter-gtk.pc clutter-gtk-$(CLUTTER_GTK_API_VERSION).pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = clutter-gtk-0.9.pc
+pkgconfig_DATA = clutter-gtk-$(CLUTTER_GTK_API_VERSION).pc
 
-CLEANFILES = clutter-gtk-0.9.pc
+CLEANFILES = clutter-gtk-$(CLUTTER_GTK_API_VERSION).pc
 
 DISTCLEANFILES = clutter-gtk.pc
 

diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index 127e189..d0a0250 100644 (file)
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -18,19 +18,18 @@ AM_CPPFLAGS = \
        $(CLUTTER_CFLAGS) \
        $(GTK_CFLAGS)
 
-lib_LTLIBRARIES = libclutter-gtk-0.9.la
+lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
 
 # please, keep the list sorted alphabetically
-libclutter_gtk_0_9_la_SOURCES = \
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = \
        $(srcdir)/gtk-clutter-embed.c           \
        $(srcdir)/gtk-clutter-scrollable.c      \
        $(srcdir)/gtk-clutter-util.c            \
        $(srcdir)/gtk-clutter-viewport.c        \
        $(srcdir)/gtk-clutter-zoomable.c
 
-libclutter_gtk_0_9_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
-
-libclutter_gtk_0_9_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
 
 cluttergtkheadersdir = $(includedir)/clutter-0.9/clutter-gtk
 
@@ -46,20 +45,21 @@ cluttergtkheaders_HEADERS = \
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
-GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gtk-0.9.la
+GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
        $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
                --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
                $(INCLUDES) \
                --add-include-path=$(srcdir) --add-include=path=. \
-               --include=Clutter-@CLUTTER_GTK_API_VERSION@ \
+               --include=Clutter-0.9 \
                --include=Gtk-2.0 \
                --library=clutter-gtk-@CLUTTER_GTK_API_VERSION@ \
+               --libtool="$(top_builddir)/libtool" \
                --output $@ \
                --pkg gobject-2.0 \
-               --pkg clutter-@CLUTTER_GTK_API_VERSION@ \
+               --pkg clutter-0.9 \
                --pkg gtk+-2.0 \
                $(cluttergtkheaders_HEADERS) \
-               $(libclutter_gtk_0_9_la_SOURCES)
+               $(libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES)
 
 BUILT_GIRSOURCES += GtkClutter-@CLUTTER_GTK_API_VERSION@.gir
 
@@ -72,7 +72,7 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+       $(QUIET_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 9701c3c..d189cb8 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -72,7 +72,7 @@ expand_content_files=
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
 INCLUDES=-I$(top_srcdir) $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/clutter-gtk/libclutter-gtk-$(CLUTTER_GTK_MAJOR_VERSION).$(CLUTTER_GTK_MINOR_VERSION).la $(CLUTTER_LIBS) $(GTK_LIBS)
+GTKDOC_LIBS=$(top_builddir)/clutter-gtk/libclutter-gtk-$(CLUTTER_GTK_API_VERSION).la $(CLUTTER_LIBS) $(GTK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

diff --git a/examples/Makefile.am b/examples/Makefile.am
index a59aca3..1e5d047 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -13,10 +13,10 @@ INCLUDES = \
 AM_CPPFLAGS = $(MAINTAINER_CFLAGS) $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
 
 common_deps = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.9.la
+       $(top_builddir)/clutter-gtk/libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
 
 common_ldadd = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.9.la \
+       $(top_builddir)/clutter-gtk/libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la \
        $(CLUTTER_LIBS) \
        $(GTK_LIBS)