build: Update to something resembling sanity

9 files changed, 51 insertions, 294 deletions

diff --git a/Makefile.am b/Makefile.am
index 5c1720a..f74f804 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,9 @@
 ACLOCAL_AMFLAGS = -I build/autotools
 
-V         = @
-Q         = $(V:1=)
-QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
-
 SUBDIRS = build clutter-gtk doc examples
 
 clutter-gtk-@CLUTTER_GTK_API_VERSION@.pc: clutter-gtk.pc
-	$(QUIET_GEN)cp -f clutter-gtk.pc clutter-gtk-$(CLUTTER_GTK_API_VERSION).pc
+	$(AM_V_GEN)cp -f clutter-gtk.pc clutter-gtk-$(CLUTTER_GTK_API_VERSION).pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = clutter-gtk-$(CLUTTER_GTK_API_VERSION).pc
diff --git a/autogen.sh b/autogen.sh
index f5feee2..7da43d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,8 @@
 #! /bin/sh
 
 PKG_NAME=Clutter-Gtk
-TEST_TYPE=-d
-FILE=clutter-gtk
+TEST_TYPE=-f
+FILE=clutter-gtk/clutter-gtk.h
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
@@ -14,15 +14,6 @@ test $TEST_TYPE $FILE || {
 
 gtkdocize || exit $?
 
-# we need to patch gtk-doc.make to support pretty output with
-# libtool 1.x.  Should be fixed in the next version of gtk-doc.
-# To be more resilient with the various versions of gtk-doc one
-# can find, just sed gkt-doc.make rather than patch it.
-sed -e 's#) --mode=compile#) --tag=CC --mode=compile#' gtk-doc.make > gtk-doc.temp \
-        && mv gtk-doc.temp gtk-doc.make
-sed -e 's#) --mode=link#) --tag=CC --mode=link#' gtk-doc.make > gtk-doc.temp \
-        && mv gtk-doc.temp gtk-doc.make
-
 ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" autoreconf -v --install || exit $?
 
 ./configure "$@" && echo Now type make to compile $PKG_NAME.
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index b911023..e5f8419 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -1,8 +1,5 @@
 EXTRA_DIST = \
-	shave-libtool.in 	\
-	shave.in 		\
-	shave.m4 		\
 	introspection.m4	\
 	as-compiler-flag.m4
 
-DISTCLEANFILES = shave-libtool shave
+DISTCLEANFILES =
diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4
index bb3a0da..589721c 100644
--- a/build/autotools/introspection.m4
+++ b/build/autotools/introspection.m4
@@ -21,7 +21,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     ],[dnl
         AC_ARG_ENABLE(introspection,
                   AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),,
+                                 [Enable introspection for this build]),, 
                                  [enable_introspection=auto])
     ])dnl
 
@@ -42,7 +42,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     [auto],[dnl
         PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
     ],dnl
-    [dnl
+    [dnl	
         AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
     ])dnl
 
@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
     fi
     AC_SUBST(INTROSPECTION_SCANNER)
     AC_SUBST(INTROSPECTION_COMPILER)
     AC_SUBST(INTROSPECTION_GENERATE)
     AC_SUBST(INTROSPECTION_GIRDIR)
     AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
 
     AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 ])
diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in
deleted file mode 100644
index 7b3d63f..0000000
--- a/build/autotools/shave-libtool.in
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-tempval=`echo $1 | sed s/\'//g`
-if test "x$tempval" = "x$SHELL"; then
-   shift
-fi
-tempval=`echo $1 | sed s/\'//g`
-LIBTOOL="$tempval"
-shift
-
-# if 1, don't print anything, the underlaying wrapper will do it
-pass_though=0
-
-# scan the arguments, keep the right ones for libtool, and discover the mode
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-        preserved_args="$preserved_args $opt"
-        ;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-case "$mode" in
-compile)
-    # shave will be called and print the actual CC/CXX/LINK line
-    preserved_args="$preserved_args --shave-mode=$mode"
-    pass_though=1
-    ;;
-link)
-    preserved_args="$preserved_args --shave-mode=$mode"
-    Q="  LINK  "
-    ;;
-*)
-    # let's u
-    # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_though -eq 0; then
-        echo "$Q$output"
-    fi
-    $LIBTOOL --silent $preserved_args
-else
-    echo $LIBTOOL $preserved_args
-    $LIBTOOL $preserved_args
-fi
diff --git a/build/autotools/shave.in b/build/autotools/shave.in
deleted file mode 100644
index 5c16f27..0000000
--- a/build/autotools/shave.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the tool to wrap (cc, cxx, ar, ranlib, ..)
-tool="$1"
-shift
-
-# the reel tool (to call)
-REEL_TOOL="$1"
-shift
-
-pass_through=0
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --shave-mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-	;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-# mode=link is handled in the libtool wrapper
-case "$mode,$tool" in
-link,*)
-    pass_through=1
-    ;;
-*,cxx)
-    Q="  CXX   "
-    ;;
-*,cc)
-    Q="  CC    "
-    ;;
-*,fc)
-    Q="  FC    "
-    ;;
-*,f77)
-    Q="  F77   "
-    ;;
-*,objc)
-    Q="  OBJC   "
-    ;;
-*,*)
-    # should not happen
-    Q="  CC    "
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_through -eq 0; then
-        echo "$Q$output"
-    fi
-    $REEL_TOOL $preserved_args
-else
-    echo $REEL_TOOL $preserved_args
-    $REEL_TOOL $preserved_args
-fi
diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4
deleted file mode 100644
index 0a3509e..0000000
--- a/build/autotools/shave.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl Make automake/libtool output more friendly to humans
-dnl  Damien Lespiau <damien.lespiau@gmail.com>
-dnl
-dnl SHAVE_INIT([shavedir],[default_mode])
-dnl
-dnl shavedir: the directory where the shave scripts are, it defaults to
-dnl           $(top_builddir)
-dnl default_mode: (enable|disable) default shave mode.  This parameter
-dnl               controls shave's behaviour when no option has been
-dnl               given to configure.  It defaults to disable.
-dnl
-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
-dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrites CC and
-dnl   LIBTOOL, you don't want the configure tests to have these variables
-dnl   re-defined.
-dnl * This macro requires GNU make's -s option.
-
-AC_DEFUN([_SHAVE_ARG_ENABLE],
-[
-  AC_ARG_ENABLE([shave],
-    AS_HELP_STRING(
-      [--enable-shave],
-      [use shave to make the build pretty [[default=$1]]]),,
-      [enable_shave=$1]
-    )
-])
-
-AC_DEFUN([SHAVE_INIT],
-[
-  dnl you can tweak the default value of enable_shave
-  m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
-
-  if test x"$enable_shave" = xyes; then
-    dnl where can we find the shave scripts?
-    m4_if([$1],,
-      [shavedir="$ac_pwd"],
-      [shavedir="$ac_pwd/$1"])
-    AC_SUBST(shavedir)
-
-    dnl make is now quiet
-    AC_SUBST([MAKEFLAGS], [-s])
-    AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
-
-    dnl we need sed
-    AC_CHECK_PROG(SED,sed,sed,false)
-
-    dnl substitute libtool
-    SHAVE_SAVED_LIBTOOL=$LIBTOOL
-    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
-    AC_SUBST(LIBTOOL)
-
-    dnl substitute cc/cxx
-    SHAVE_SAVED_CC=$CC
-    SHAVE_SAVED_CXX=$CXX
-    SHAVE_SAVED_FC=$FC
-    SHAVE_SAVED_F77=$F77
-    SHAVE_SAVED_OBJC=$OBJC
-    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
-    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
-    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
-    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
-    OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
-    AC_SUBST(CC)
-    AC_SUBST(CXX)
-    AC_SUBST(FC)
-    AC_SUBST(F77)
-    AC_SUBST(OBJC)
-
-    V=@
-  else
-    V=1
-  fi
-  Q='$(V:1=)'
-  AC_SUBST(V)
-  AC_SUBST(Q)
-])
-
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index 7cb4daa..6e267b4 100644
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -1,7 +1,8 @@
 CLEANFILES=
-INCLUDES = \
-	-I$(srcdir) 				\
-	-I$(top_srcdir) 			\
+
+INCLUDES = -I$(srcdir) -I$(top_srcdir)
+
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Clutter-Gtk\" 		\
 	-DPREFIX=\""$(prefix)"\" 		\
 	-DLIBDIR=\""$(libdir)"\" 		\
@@ -10,56 +11,52 @@ INCLUDES = \
         -DGDK_PIXBUF_DISABLE_DEPRECATED         \
         -DGDK_DISABLE_DEPRECATED                \
         -DGTK_DISABLE_DEPRECATED                \
-	-DCLUTTER_DISABLE_DEPRECATED
-
-AM_CPPFLAGS = \
-	$(CLUTTER_GTK_DEBUG_CFLAGS) \
-	$(MAINTAINER_CFLAGS) \
-	$(CLUTTER_CFLAGS) \
-	$(GTK_CFLAGS)
-
-lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
+	-DCOGL_DISABLE_DEPRECATED		\
+	-DCLUTTER_DISABLE_DEPRECATED		\
+	$(CLUTTER_GTK_DEBUG_CFLAGS)
 
-# please, keep the list sorted alphabetically
-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = \
+# please, keep these lists sorted alphabetically
+sources_c = \
 	$(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
 
+sources_h = \
+	$(srcdir)/gtk-clutter-embed.h 		\
+	$(srcdir)/gtk-clutter-scrollable.h 	\
+	$(srcdir)/gtk-clutter-util.h 		\
+	$(srcdir)/gtk-clutter-viewport.h	\
+	$(srcdir)/gtk-clutter-zoomable.h
+
+lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
+
+# please, keep the list sorted alphabetically
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
 
 cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
-
-# please, keep the list sorted alphabetically
-cluttergtkheaders_HEADERS = \
-	$(top_srcdir)/clutter-gtk/clutter-gtk.h 		\
-	$(top_srcdir)/clutter-gtk/gtk-clutter-embed.h 		\
-	$(top_srcdir)/clutter-gtk/gtk-clutter-scrollable.h 	\
-	$(top_srcdir)/clutter-gtk/gtk-clutter-util.h 		\
-	$(top_srcdir)/clutter-gtk/gtk-clutter-viewport.h	\
-	$(top_srcdir)/clutter-gtk/gtk-clutter-zoomable.h
+cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
-GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
-	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
+GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
+	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
-		$(INCLUDES) \
+		--strip-prefix=GtkClutter \
+		$(INCLUDES) $(AM_CPPFLAGS) \
 		--add-include-path=$(srcdir) --add-include=path=. \
 		--include=Clutter-1.0 \
+		--include=GdkPixbuf-2.0 \
 		--include=Gtk-2.0 \
 		--library=libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la \
 		--libtool="$(top_builddir)/libtool" \
 		--output $@ \
-		--pkg gobject-2.0 \
-		--pkg clutter-1.0 \
-		--pkg gtk+-2.0 \
-		$(cluttergtkheaders_HEADERS) \
-		$(libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES)
+		$(sources_h) $(sources_c)
 
 BUILT_GIRSOURCES += GtkClutter-@CLUTTER_GTK_API_VERSION@.gir
 
@@ -72,7 +69,7 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)\
+	$(AM_V_GEN)\
 	LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
 	$(INTROSPECTION_COMPILER) \
 		--includedir=$(srcdir) \
diff --git a/configure.ac b/configure.ac
index 0e6cb79..872f745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ m4_define([clutter_gtk_version], [clutter_gtk_major.clutter_gtk_minor.clutter_gt
 m4_define([clutter_gtk_interface_age], [0])
 m4_define([clutter_gtk_binary_age], [m4_eval(100 * clutter_gtk_minor + clutter_gtk_micro)])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.63])
 
 AC_INIT([clutter-gtk],
         [clutter_gtk_version],
@@ -22,7 +22,8 @@ AC_CONFIG_MACRO_DIR([build/autotools])
 
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define dist-bzip2])
+AM_SILENT_RULES([yes])
 
 CLUTTER_GTK_MAJOR_VERSION=clutter_gtk_major
 CLUTTER_GTK_MINOR_VERSION=clutter_gtk_minor
@@ -50,9 +51,11 @@ AC_SUBST(CLUTTER_GTK_LT_LDFLAGS)
 dnl ========================================================================
 
 # Checks for programs.
-AC_PROG_CC
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+AC_PROG_CC_C_O
+AC_HEADER_STDC
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 m4_define([clutter_req_version], [1.2.0])
 m4_define([gtk_req_version], [2.19.5])
@@ -154,20 +157,16 @@ AC_SUBST(GTK_PREFIX)
 AC_SUBST(GDK_PIXBUF_PREFIX)
 AC_SUBST(CLUTTER_PREFIX)
 
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.14])
 
-GOBJECT_INTROSPECTION_CHECK([0.6.4])
+GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
 dnl ========================================================================
 
-SHAVE_INIT([build/autotools], [enable])
-
 AC_CONFIG_FILES([
         Makefile
         build/Makefile
         build/autotools/Makefile
-        build/autotools/shave-libtool
-        build/autotools/shave
         clutter-gtk/Makefile
         doc/Makefile
         doc/reference/Makefile