From 76140c5f521a8912786c292a2699b48a7b873d16 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 27 Jul 2009 16:51:14 +0100 Subject: [PATCH] [build] Use API_VERSION, not MAJORMINOR The correct macro for Clutter's API version is CLUTTER_API_VERSION, not CLUTTER_MAJORMINOR anymore. --- doc/reference/clutter/Makefile.am | 2 +- doc/reference/cogl/Makefile.am | 2 +- tests/conform/Makefile.am | 2 +- tests/interactive/Makefile.am | 2 +- tests/micro-bench/Makefile.am | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index 535e51ef7..3b702111b 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -140,7 +140,7 @@ expand_content_files= \ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter $(CLUTTER_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la $(CLUTTER_LIBS) +GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am index 9d7575a28..e031b341c 100644 --- a/doc/reference/cogl/Makefile.am +++ b/doc/reference/cogl/Makefile.am @@ -91,7 +91,7 @@ expand_content_files = \ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter $(CLUTTER_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la $(CLUTTER_LIBS) +GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index cf8966618..be8fcdb03 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -71,7 +71,7 @@ test_conformance_CFLAGS = \ $(CLUTTER_CFLAGS) \ $(MAINTAINER_CFLAGS) -test_conformance_LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la +test_conformance_LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la .PHONY: test .PHONY: test-report test-report-normal test-report-disable-npots diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 2d503c751..1af97a448 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -79,7 +79,7 @@ INCLUDES = \ -I$(top_builddir)/clutter \ -DG_DISABLE_SINGLE_INCLUDES -common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la +common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la noinst_PROGRAMS = test-interactive diff --git a/tests/micro-bench/Makefile.am b/tests/micro-bench/Makefile.am index 37a99730f..7388e66c5 100644 --- a/tests/micro-bench/Makefile.am +++ b/tests/micro-bench/Makefile.am @@ -4,12 +4,13 @@ noinst_PROGRAMS = \ test-text-perf INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter -LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la +LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la AM_CFLAGS = \ $(CLUTTER_CFLAGS) \ $(MAINTAINER_CFLAGS) \ -DG_DISABLE_SINGLE_INCLUDES \ -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" + AM_LDFLAGS = $(CLUTTER_LIBS) test_text_SOURCES = test-text.c