diff --git a/ChangeLog b/ChangeLog index c9b3a47e5..4a3baea6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-11-29 Alexandre Duret-Lutz + + Fix build failure during "make check" on MacOS X. + + * src/kripketest/Makefile.am (LDADD): Remove a broken dependency. + Reported by Yann Thierry-Mieg. + * src/sanity/style.test: Make sure it does not appear again. + 2011-11-28 Alexandre Duret-Lutz * AUTHORS: Sort alphabetically. diff --git a/src/kripketest/Makefile.am b/src/kripketest/Makefile.am index 9d5b75be2..15b832a91 100644 --- a/src/kripketest/Makefile.am +++ b/src/kripketest/Makefile.am @@ -24,7 +24,7 @@ kripketestdir = $(pkgincludedir)/kripketest kripketest_HEADERS = -LDADD = ../libspot.la ../../buddy/src/.libs/libbdd.so +LDADD = ../libspot.la check_SCRIPTS = defs diff --git a/src/sanity/style.test b/src/sanity/style.test index 5d3bb2c13..8c98c91a6 100755 --- a/src/sanity/style.test +++ b/src/sanity/style.test @@ -216,6 +216,27 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do done || : # Make sure sh does not abort when read exits with false. done + +# Rules for Makefiles. +for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do + + find "$dir" -name "Makefile.am" -a -type f -a -print | + while read file; do + fail=false + + # Strip comments. + sed 's,#.*,,' < $file > $tmp + + grep '[ ]$' $tmp && + diag 'Trailing whitespace.' + + grep '\.libs/' $tmp && + diag "Don't reference files in .libs/, use Libtool instead." + + $fail && echo "$file" >>failures + done || : # Make sure sh does not abort when read exits with false. +done + if test -f failures; then echo "The following files contain style errors:" cat failures