diff options
| author | Emmanuele Bassi <ebassi@openedhand.com> | 2007-08-15 08:48:42 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@openedhand.com> | 2007-08-15 08:48:42 +0000 |
| commit | 16a419a78342b5c5b0425a293f8abe726048be65 (patch) | |
| tree | f9ade8c54c6b3cdebe895516e410d1a72e49572c | |
| parent | e68b8b1bc43cdb15baa2376308e1ea8205734204 (diff) | |
| download | clutter-gtk-16a419a78342b5c5b0425a293f8abe726048be65.tar.gz | |
2007-08-15 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac:
* clutter-gtk.pc.in:
* Makefile.am:
* clutter-gtk/Makefile.am: Bump up to 0.5.0 and require
clutter-gtk-0.5 as well.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | clutter-gtk.pc.in | 6 | ||||
| -rw-r--r-- | clutter-gtk/Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 6 |
5 files changed, 23 insertions, 15 deletions
@@ -1,3 +1,11 @@ +2007-08-15 Emmanuele Bassi <ebassi@openedhand.com> + + * configure.ac: + * clutter-gtk.pc.in: + * Makefile.am: + * clutter-gtk/Makefile.am: Bump up to 0.5.0 and require + clutter-gtk-0.5 as well. + 2007-08-07 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Bump up to 0.4.0; require clutter-glx-0.4. diff --git a/Makefile.am b/Makefile.am index 64f1940..d5c6580 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = clutter-gtk doc examples -clutter-gtk-0.4.pc: clutter-gtk.pc - @cp -f clutter-gtk.pc clutter-gtk-0.4.pc +clutter-gtk-0.5.pc: clutter-gtk.pc + @cp -f clutter-gtk.pc clutter-gtk-0.5.pc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = clutter-gtk-0.4.pc +pkgconfig_DATA = clutter-gtk-0.5.pc -CLEANFILES = clutter-gtk-0.4.pc +CLEANFILES = clutter-gtk-0.5.pc DISTCLEANFILES = clutter-gtk.pc diff --git a/clutter-gtk.pc.in b/clutter-gtk.pc.in index 6d8f6c5..c791115 100644 --- a/clutter-gtk.pc.in +++ b/clutter-gtk.pc.in @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: clutter-gtk Description: GTK+ widget for Clutter Version: @VERSION@ -Libs: -L${libdir} -lclutter-gtk-0.4 -Cflags: -I${includedir}/clutter-0.4/clutter-gtk -Requires: clutter-0.4 gtk+-2.0 +Libs: -L${libdir} -lclutter-gtk-0.5 +Cflags: -I${includedir}/clutter-0.5/clutter-gtk +Requires: clutter-0.5 gtk+-2.0 diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am index 7564604..84e7f49 100644 --- a/clutter-gtk/Makefile.am +++ b/clutter-gtk/Makefile.am @@ -9,11 +9,11 @@ INCLUDES = \ $(CLUTTER_CFLAGS) \ $(GTK_CFLAGS) -lib_LTLIBRARIES = libclutter-gtk-0.4.la +lib_LTLIBRARIES = libclutter-gtk-0.5.la -libclutter_gtk_0_4_la_SOURCES = clutter-gtk.c -libclutter_gtk_0_4_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS) -libclutter_gtk_0_4_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS) +libclutter_gtk_0_5_la_SOURCES = clutter-gtk.c +libclutter_gtk_0_5_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS) +libclutter_gtk_0_5_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS) -cluttergtkheadersdir = $(includedir)/clutter-0.4/clutter-gtk +cluttergtkheadersdir = $(includedir)/clutter-0.5/clutter-gtk cluttergtkheaders_HEADERS = clutter-gtk.h diff --git a/configure.ac b/configure.ac index 1b64047..ab40f0a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # An odd micro number indicates in-progress development, (eg. from CVS) # An even micro number indicates a released version. m4_define([clutter_major_version], [0]) -m4_define([clutter_minor_version], [4]) +m4_define([clutter_minor_version], [5]) m4_define([clutter_micro_version], [0]) m4_define([clutter_version], @@ -67,9 +67,9 @@ AC_FUNC_MALLOC AC_FUNC_MMAP AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) -CLUTTER_REQUIRED=0.4.0 +CLUTTER_REQUIRED=0.5.0 -PKG_CHECK_MODULES(CLUTTER, clutter-glx-0.4 >= $CLUTTER_REQUIRED) +PKG_CHECK_MODULES(CLUTTER, clutter-glx-0.5 >= $CLUTTER_REQUIRED) AC_SUBST(CLUTTER_CFLAGS) AC_SUBST(CLUTTER_LIBS) |