[cairo-commit] 2 commits - src/check-plt.sh src/Makefile.am

[Chris Wilson]

 src/Makefile.am  |    2 +-
 src/check-plt.sh |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0b9124069271593be390d9835fcd1527b20770e3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jan 11 21:55:52 2008 +0000

    [check-plt.sh] Ensure that $MAKE is defined.
    
    Copy the check from check-def.sh now that $MAKE is also used in
    check-plt.sh

diff --git a/src/check-plt.sh b/src/check-plt.sh
index ce0952d..82ea6de 100755
--- a/src/check-plt.sh
+++ b/src/check-plt.sh
@@ -8,6 +8,7 @@ if ! which readelf 2>/dev/null >/dev/null; then
 fi
 
 test -z "$srcdir" && srcdir=.
+test -z "$MAKE" && MAKE=make
 status=0
 
 $MAKE check-has-hidden-symbols.i || exit 1
commit 92c744978f0c08456cf0ec8dca87abebf6a6d150
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jan 11 21:54:58 2008 +0000

    [Makefile.am] Tweak the flags passed to CPP.
    
    Adjust the flags passed to $(CPP) to match those used in the
    surrounding targets (splint and sparse), which should improve their
    reliability.

diff --git a/src/Makefile.am b/src/Makefile.am
index b529879..24d3f35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -323,7 +323,7 @@ EXTRA_DIST += $(TESTS) check-has-hidden-symbols.c
 # The pre-processed result is used by check-{def,plt}.sh to determine whether
 # cairo has been compiled with symbol hiding.
 .c.i: $(cairoinclude_HEADERS) $(nodist_cairoinclude_HEADERS) cairoint.h $(top_builddir)/config.h
-	$(CPP) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) $(CAIRO_CFLAGS) $< -o $@
+	$(CPP) -DHAVE_CONFIG_H -I$(top_builddir) $(libcairo_la_CFLAGS) $< -o $@
 
 SPARSE = sparse
 sparse: