Merge branch 'master' of git://git.sv.gnu.org/lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index eb37ee3093e8f2747d5c7f03fae9b3799bcc5fb6..898a4c245b132bce3aa155ee0260f6c3d837dc76 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -165,7 +165,7 @@ default: $(ALL_GEN_FILES) \
 .PHONY: tree-regen
 
 # FIXME: temporary hack: must regenerate after building fonts
-tree-regen:
+tree-regen: $(ALL_GEN_FILES)
        ${MAKE} -C $(top-build-dir) link-mf-tree
 
 ##

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index e556dae0e1745ab63700ae902c4f8369a10e0310..b2e27613a4ed8bf796496ce5c05cea62ea5a8a6c 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1032,7 +1032,9 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
     AC_CHECK_PROGS(PYTHON_CONFIG, python-config, no)
 
     if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
-       PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
+        # Clean out junk: http://bugs.python.org/issue3290
+       # Python headers may need some -f* flags, leave them in.
+       PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\)\(\w\|-\)\+//g'`
        PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
     fi