configure.ac | 1 - src/check-c-linkage-decls.sh | 3 +-- src/check-header-guards.sh | 8 ++++---- src/hb-private.hh | 2 +- src/hb-uniscribe.h | 6 +++--- test/Makefile.am | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-)
New commits: commit c747f509bcc4e6a34ced04e9e79ed414a44437b1 Author: Behdad Esfahbod <[email protected]> Date: Thu Aug 4 01:51:30 2011 -0400 More out-of-tree build fixes diff --git a/src/check-c-linkage-decls.sh b/src/check-c-linkage-decls.sh index 84e77cf..35893a8 100755 --- a/src/check-c-linkage-decls.sh +++ b/src/check-c-linkage-decls.sh @@ -10,9 +10,8 @@ test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'` test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` -cd "$srcdir" - for x in $HBHEADERS $HBSOURCES; do + test -f $srcdir/$x && x=$srcdir/$x if ! grep -q HB_BEGIN_DECLS "$x" || ! grep -q HB_END_DECLS "$x"; then echo "Ouch, file $x does not HB_BEGIN_DECLS / HB_END_DECLS" stat=1 diff --git a/src/check-header-guards.sh b/src/check-header-guards.sh index ddbcd83..212b803 100755 --- a/src/check-header-guards.sh +++ b/src/check-header-guards.sh @@ -10,12 +10,12 @@ test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'` test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` -cd "$srcdir" - +echo $srcdir for x in $HBHEADERS $HBSOURCES; do + test -f "$srcdir/$x" && x="$srcdir/$x" echo "$x" | grep '[^h]$' -q && continue; - x=`echo "$x" | sed 's@.*/@@'` - tag=`echo "$x" | tr 'a-z.-' 'A-Z_'` + xx=`echo "$x" | sed 's@.*/@@'` + tag=`echo "$xx" | tr 'a-z.-' 'A-Z_'` lines=`grep "\<$tag\>" "$x" | wc -l` if test "x$lines" != x3; then echo "Ouch, header file $x does not have correct preprocessor guards" commit 0530ca9a180edc330ab801c535907cefa4a0c298 Author: Behdad Esfahbod <[email protected]> Date: Thu Aug 4 01:42:59 2011 -0400 Fix out-of-tree build diff --git a/test/Makefile.am b/test/Makefile.am index a769688..0fbc689 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -7,7 +7,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = if HAVE_GLIB -AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) +AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS) EXTRA_DIST += hb-test.h commit ddbf4edc5d09a645351b1bd1722b068aba6a6dec Author: Behdad Esfahbod <[email protected]> Date: Thu Aug 4 01:38:37 2011 -0400 Minor diff --git a/configure.ac b/configure.ac index 125349e..9e798cb 100644 --- a/configure.ac +++ b/configure.ac @@ -103,7 +103,6 @@ AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft) dnl ========================================================================== PKG_CHECK_MODULES(ICU, icu, have_icu=true, [ - have_icu=false if test $cross_compiling == no; then AC_CHECK_PROG([have_icu], [icu-config], [true], [false]) if $have_icu; then commit 20dde6101662fd9ebe5f613631ea468f4c0a995f Author: Behdad Esfahbod <[email protected]> Date: Thu Aug 4 01:07:33 2011 -0400 Minor diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h index 2156af4..d498f97 100644 --- a/src/hb-uniscribe.h +++ b/src/hb-uniscribe.h @@ -24,8 +24,8 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_USP_SHAPE_H -#define HB_USP_SHAPE_H +#ifndef HB_UNISCRIBE_H +#define HB_UNISCRIBE_H #include "hb-common.h" #include "hb-shape.h" @@ -43,4 +43,4 @@ hb_uniscribe_shape (hb_font_t *font, HB_END_DECLS -#endif /* HB_USP_SHAPE_H */ +#endif /* HB_UNISCRIBE_H */ commit 44b4f50d05fd51d8056a78e359fbb00fbcac43a0 Author: Behdad Esfahbod <[email protected]> Date: Thu Aug 4 00:52:20 2011 -0400 Fix typo diff --git a/src/hb-private.hh b/src/hb-private.hh index 752bd24..b5c8cef 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -130,7 +130,7 @@ ASSERT_STATIC (sizeof (hb_var_int_t) == 4); #else #define HB_PURE_FUNC #define HB_CONST_FUNC -#define HB_PRINTF_FUCN(format_idx, arg_idx) +#define HB_PRINTF_FUNC(format_idx, arg_idx) #endif #if __GNUC__ >= 4 #define HB_UNUSED __attribute__((unused)) _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
