[cairo-commit] 4 commits - build/configure.ac.tools configure.ac test/buffer-diff.c test/cairo-test.c test/imagediff.c test/pthread-show-text.c util/Makefile.am

[Behdad Esfahbod]

 build/configure.ac.tools |    1 +
 configure.ac             |    2 +-
 test/buffer-diff.c       |    1 -
 test/cairo-test.c        |    1 -
 test/imagediff.c         |    1 -
 test/pthread-show-text.c |    1 -
 util/Makefile.am         |    2 +-
 7 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 22de0f6b8d3d680f29d781e1d71cf35a29cd26a9
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 4 23:26:19 2008 -0400

    [configure.ac] Add some automake options

diff --git a/configure.ac b/configure.ac
index 08fd0d1..896b498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([cairo],
 AC_CONFIG_SRCDIR(src/cairo.h)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.8 foreign no-define])
 
 dnl ===========================================================================
 dnl
commit 82c91ec681bbd4fa8e64c411a94570a20a341ef0
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 4 23:25:57 2008 -0400

    [util] Fix an automake warning

diff --git a/util/Makefile.am b/util/Makefile.am
index 1c0cff9..8b1aa21 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,7 +1,7 @@
 
 util: malloc-stats.so
 
-%.so: %.la
+.la.so:
 	$(RM) $@
 	$(LN_S) .libs/$*.so $@
 
commit 965b0e51ec8e1f57aaa7f7cdd86ef8968f059b7b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 4 23:25:27 2008 -0400

    [test] Do not include "xmalloc.h" directly
    
    Not needed, it's renamed and included by boilerplate directly.

diff --git a/test/buffer-diff.c b/test/buffer-diff.c
index f37ef6e..f9b4a95 100644
--- a/test/buffer-diff.c
+++ b/test/buffer-diff.c
@@ -40,7 +40,6 @@
 
 #include "pdiff.h"
 #include "buffer-diff.h"
-#include "xmalloc.h"
 
 /* Don't allow any differences greater than this value, even if pdiff
  * claims that the images are identical */
diff --git a/test/cairo-test.c b/test/cairo-test.c
index b29ffb9..15dd251 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -52,7 +52,6 @@
 #include "cairo-test.h"
 
 #include "buffer-diff.h"
-#include "xmalloc.h"
 
 #ifdef _MSC_VER
 #include <crtdbg.h>
diff --git a/test/imagediff.c b/test/imagediff.c
index 73e4629..1cbd1b7 100644
--- a/test/imagediff.c
+++ b/test/imagediff.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 
 #include "buffer-diff.h"
-#include "xmalloc.h"
 
 static void
 _xunlink (const char *pathname)
diff --git a/test/pthread-show-text.c b/test/pthread-show-text.c
index daf04c3..d612019 100644
--- a/test/pthread-show-text.c
+++ b/test/pthread-show-text.c
@@ -30,7 +30,6 @@
 */
 
 #include "cairo-test.h"
-#include "xmalloc.h"
 
 #include <string.h>
 #include <stdlib.h>
commit 620e19e849f3dcc5747abe5b6d1adca4a08df9c7
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 4 23:09:58 2008 -0400

    [configure.ac] Add AM_PROG_CC_C_O
    
    Needed for per-target flags in test/Makefile.am

diff --git a/build/configure.ac.tools b/build/configure.ac.tools
index 7f13525..d2b11c8 100644
--- a/build/configure.ac.tools
+++ b/build/configure.ac.tools
@@ -7,6 +7,7 @@ GTK_DOC_CHECK([1.6])
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX dnl required for BeOS (and cannot be a conditional dependency)
+AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL dnl required version (1.4) DON'T REMOVE!
 AC_C_INLINE