From 83dafa5f9ee9d2475c82bef75d0eaed3973f235f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 23 Mar 2007 15:20:35 +0000 Subject: [PATCH] 2007-03-23 Emmanuele Bassi Assorted build fixes to pass distcheck. * clutter/glx/Makefile.am: Install the clutter-glx.h header. * clutter/Makefile.am: Actually apply linker flags. * configure.ac: Use a more readable CLUTTER_API_VERSION instead of CLUTTER_MAJORMINOR; require gobject-2.0 with glib-2.0 >= 2.10, as we are using GObject and the slice allocator from glib 2.10. * clutter.pc.in: Add the apiversion variable. --- ChangeLog | 14 ++++++++++++++ clutter.pc.in | 5 +++-- clutter/Makefile.am | 17 ++++++----------- clutter/glx/Makefile.am | 3 ++- configure.ac | 15 ++++++++++----- 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d4ca0b80..f5d58e058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-03-23 Emmanuele Bassi + + Assorted build fixes to pass distcheck. + + * clutter/glx/Makefile.am: Install the clutter-glx.h header. + + * clutter/Makefile.am: Actually apply linker flags. + + * configure.ac: Use a more readable CLUTTER_API_VERSION instead + of CLUTTER_MAJORMINOR; require gobject-2.0 with glib-2.0 >= 2.10, + as we are using GObject and the slice allocator from glib 2.10. + + * clutter.pc.in: Add the apiversion variable. + 2007-03-23 Emmanuele Bassi * clutter/clutter-event.c: Pop and peek the event queue diff --git a/clutter.pc.in b/clutter.pc.in index 350799e43..8d413cd14 100644 --- a/clutter.pc.in +++ b/clutter.pc.in @@ -3,10 +3,11 @@ exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include backend=@clutterbackend@ +apiversion=@CLUTTER_API_VERSION@ Name: Clutter Description: Clutter Core Library (${backend} backend) Version: @VERSION@ -Libs: -L${libdir} -lclutter-${backend}-0.3 -Cflags: -I${includedir}/clutter-0.3 +Libs: -L${libdir} -lclutter-${backend}-${apiversion} +Cflags: -I${includedir}/clutter-${apiversion} Requires: glib-2.0 >= 2.10 gobject-2.0 gthread-2.0 pangoft2 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 6686aaf06..82e57474e 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -26,7 +26,7 @@ INCLUDES = \ $(NULL) LDADD = \ - -version-info $(LT_VERSION_INFO) \ + -version-info $(CLUTTER_LT_VERSION) \ -export-dynamic \ -rpath $(libdir) \ $(NULL) @@ -149,20 +149,15 @@ source_h_priv = \ $(NULL) -libclutter_glx_0_3_la_LIBADD = \ - $(CLUTTER_LIBS) \ - pango/libpangoclutter.la \ - glx/libclutter-glx.la - -libclutter_glx_0_3_la_SOURCES = \ - $(source_c) \ - $(source_h) \ - $(source_h_priv) +libclutter_glx_0_3_la_LIBADD = $(CLUTTER_LIBS) pango/libpangoclutter.la glx/libclutter-glx.la +libclutter_glx_0_3_la_SOURCES = $(source_c) $(source_h) $(source_h_priv) +libclutter_glx_0_3_la_LDFLAGS = $(LDADD) #libclutter_egl_0_3_la_LIBADD = \ # $(CLUTTER_LIBS) \ # pango/libpangoclutter.la \ # egl/libclutter-egl.la +#libclutter_egl_0_3_la_LDADD = $(LDADD) #libclutter_egl_0_3_la_SOURCES = \ # $(source_c) \ # $(source_h) \ @@ -172,7 +167,7 @@ lib_LTLIBRARIES = $(clutterbackendlib) EXTRA_LTLIBRARIES = libclutter-glx-0.3.la -clutterdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter +clutterdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter clutter_HEADERS = \ $(source_h) \ clutter-enum-types.h \ diff --git a/clutter/glx/Makefile.am b/clutter/glx/Makefile.am index 76e82a651..216d8bb10 100644 --- a/clutter/glx/Makefile.am +++ b/clutter/glx/Makefile.am @@ -1,4 +1,5 @@ -libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter +libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter +libclutterinclude_HEADERS = clutter-glx.h INCLUDES = \ -DG_LOG_DOMAIN=\"ClutterGLX\" \ diff --git a/configure.ac b/configure.ac index 5e4302af1..d21345345 100644 --- a/configure.ac +++ b/configure.ac @@ -30,11 +30,13 @@ CLUTTER_MAJOR_VERSION=clutter_major_version CLUTTER_MINOR_VERSION=clutter_minor_version CLUTTER_MICRO_VERSION=clutter_micro_version CLUTTER_VERSION=clutter_version +CLUTTER_API_VERSION=clutter_api_version CLUTTER_MAJORMINOR=clutter_api_version AC_SUBST(CLUTTER_MAJOR_VERSION) AC_SUBST(CLUTTER_MINOR_VERSION) AC_SUBST(CLUTTER_MICRO_VERSION) AC_SUBST(CLUTTER_VERSION) +AC_SUBST(CLUTTER_API_VERSION) AC_SUBST(CLUTTER_MAJORMINOR) m4_define([lt_current], @@ -90,7 +92,7 @@ if $PKG_CONFIG --exists xfixes ; then X11_LIBS="$X11_LIBS -lXfixes" fi -AC_CHECK_HEADERS([GL/gl.h GL/glx.h],, +AC_CHECK_HEADERS([GL/gl.h GL/glx.h],, [AC_MSG_ERROR([Unable to locate required GL headers])]) AC_CHECK_LIB(GL, glXCreateContext, HAVE_LIBGL=yes, HAVE_LIBGL=no) @@ -130,7 +132,7 @@ AC_SUBST([clutterbackendlib]) dnl ======================================================================== -pkg_modules="pangoft2 glib-2.0 >= 2.8 gthread-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0" +pkg_modules="pangoft2 glib-2.0 >= 2.10 gobject-2.0 gthread-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0" PKG_CHECK_MODULES(CLUTTER_DEPS, [$pkg_modules]) dnl ======================================================================== @@ -163,9 +165,11 @@ fi AC_SUBST(CLUTTER_DEBUG_CFLAGS) -AC_ARG_WITH(fpu, AS_HELP_STRING([--without-fpu], - [Assume target hardware has no fpu]), - [with_fpu=$withval], [with_fpu=yes]) +AC_ARG_WITH(fpu, + AS_HELP_STRING([--without-fpu], + [Assume target hardware has no fpu]), + [with_fpu=$withval], + [with_fpu=yes]) if test "x$with_fpu" != "xyes" ; then CLUTTER_FIXED_CFLAGS="-DCFX_NO_FPU" @@ -210,6 +214,7 @@ echo "" echo " prefix: ${prefix}" echo "" echo " Flavour: ${clutterbackend}" +echo " Target library: ${clutterbackendlib}" echo " Debug level: ${enable_debug}" echo " Documentation: ${enable_gtk_doc}" echo " FPU: ${with_fpu}"