From 967bfee073efd277af3af45428d78bc372e1c4ef Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:08:56 +0000 Subject: [PATCH] lilypond-0.1.52 --- Documentation/Makefile.am | 6 +- Documentation/Makefile.in | 8 +- Makefile.am | 7 +- Makefile.in | 8 +- bin/Makefile.am | 6 +- bin/Makefile.am.wild | 4 +- bin/Makefile.in | 8 +- bin/autowild | 38 ++ configure | 487 ++++++++------------- debian/Makefile.am | 2 +- debian/Makefile.in | 2 +- flower/Makefile.am | 7 +- flower/Makefile.in | 9 +- flower/include/Makefile.am | 5 +- flower/include/Makefile.in | 6 +- flower/test/Makefile.am | 5 +- flower/test/Makefile.in | 18 +- init/Makefile.am | 12 +- init/Makefile.in | 16 +- input/Makefile.am | 4 +- input/Makefile.in | 4 +- input/test-lyrics.ly | 10 + lib/Makefile.am | 4 +- lib/Makefile.in | 6 +- lib/include/Makefile.am | 2 +- lib/include/Makefile.in | 2 +- lily/Makefile.am | 9 +- lily/Makefile.in | 806 ++++++++++++++++++++++------------- lily/include/Makefile.am | 4 +- lily/include/Makefile.in | 4 +- make/Makefile.am | 2 +- make/Makefile.in | 2 +- make/lelievijver.lsm | 2 +- make/lilypond.lsm | 2 +- make/lilypond.spec | 2 +- mf/Makefile.am | 34 +- mf/Makefile.in | 46 +- mi2mu/Makefile.am | 7 +- mi2mu/Makefile.in | 35 +- mi2mu/include/Makefile.am | 2 +- mi2mu/include/Makefile.in | 2 +- mutopia/J.S.Bach/Makefile.am | 2 +- mutopia/J.S.Bach/Makefile.in | 2 +- mutopia/Makefile.am | 2 +- mutopia/Makefile.in | 2 +- tex/Makefile.am | 10 +- tex/Makefile.in | 14 +- 47 files changed, 950 insertions(+), 727 deletions(-) create mode 100755 bin/autowild create mode 100644 input/test-lyrics.ly diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am index b19f90a2ea..66c0e42433 100644 --- a/Documentation/Makefile.am +++ b/Documentation/Makefile.am @@ -35,9 +35,9 @@ uninstall-hook: html: $(HTMLFILES) -clean-hook: - rm $(TEXTFILES) $(MAN1GROFF) +clean-local: + -rm $(TEXTFILES) $(MAN1GROFF) include $(top_srcdir)/Documentation/Rules.make $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index 7e3d369fd4..c2e9724f86 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -190,7 +190,7 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic -clean: clean-generic mostlyclean +clean: clean-generic mostlyclean clean-local distclean: distclean-generic clean -rm -f config.status @@ -220,12 +220,12 @@ uninstall-hook: html: $(HTMLFILES) -clean-hook: - rm $(TEXTFILES) $(MAN1GROFF) +clean-local: + -rm $(TEXTFILES) $(MAN1GROFF) include $(top_srcdir)/Documentation/Rules.make $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Makefile.am b/Makefile.am index ddcfd50c6c..c25099c607 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,5 +26,10 @@ PATCHES: rm -f PATCHES ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ + +# a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not +# respect the directory +distclean-local: + rm -f lib/config.hh $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/Makefile.in b/Makefile.in index 4e1bdbe490..3a43b1d719 100644 --- a/Makefile.in +++ b/Makefile.in @@ -325,7 +325,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am -distclean: distclean-recursive distclean-am +distclean: distclean-recursive distclean-am distclean-local -rm -f config.status -rm -f libtool @@ -359,8 +359,12 @@ PATCHES: rm -f PATCHES ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ +# a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not +# respect the directory +distclean-local: + rm -f lib/config.hh $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/bin/Makefile.am b/bin/Makefile.am index c7904427ee..fd301eba42 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -8,7 +8,9 @@ SLANG_SCHRIFTEN = flower.py lilypython.py PAREL_SCHRIFTEN = IN_SCHRIFTEN = flower.py lilypython.py -EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild +clean-local: + -rm -f flower.pyc $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/bin/Makefile.am.wild b/bin/Makefile.am.wild index fb04a37aeb..aa13c4e515 100644 --- a/bin/Makefile.am.wild +++ b/bin/Makefile.am.wild @@ -5,5 +5,7 @@ SLANG_SCHRIFTEN = $(wildcard *.py) PAREL_SCHRIFTEN = $(wildcard *.pl) IN_SCHRIFTEN = $(wildcard *.py) -EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild +clean-local: + -rm -f flower.pyc diff --git a/bin/Makefile.in b/bin/Makefile.in index 2a45668f86..f508a310f6 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -104,7 +104,7 @@ absolute_builddir = @absolute_builddir@ SLANG_SCHRIFTEN = flower.py lilypython.py PAREL_SCHRIFTEN = IN_SCHRIFTEN = flower.py lilypython.py -EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = add-URLs clean-diaper clean-embeds clean-fonts \ @@ -230,7 +230,7 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic -clean: clean-generic mostlyclean +clean: clean-generic mostlyclean clean-local distclean: distclean-generic clean -rm -f config.status @@ -246,8 +246,10 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +clean-local: + -rm -f flower.pyc $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/bin/autowild b/bin/autowild new file mode 100755 index 0000000000..e2e5638735 --- /dev/null +++ b/bin/autowild @@ -0,0 +1,38 @@ +#!/bin/sh +# autowild +# for those of you that have no wild-automake + +# ugh +verbose=true +if test x$1 = x-v; then + verbose=echo +fi + +#ugh +# PERL=@PERL@ +PERL=/usr/bin/perl +PROGNAME=autowild #don't includee path; this messes up stuff +WILD_MAKEFILES=$(find . -name \*.wild) +for i in $WILD_MAKEFILES; do + dir=$(dirname $i) + wild=$(basename $i) + make=$(basename $i .wild) + TOPDIR=`pwd` + (cd $dir + + $verbose -n "trying $dir/$make.. " + cat $wild | $PERL $TOPDIR/bin/wild-perl >> $make.NEW + if [ ! -f $make ]; then + touch $make + fi + + if cmp -s $make.NEW $make; then + $verbose "autowild: $dir/$make didn't change" + rm $make.NEW + else + mv $make.NEW $make + $verbose "autowild: creating $dir/$make" + fi + ) +done + diff --git a/configure b/configure index 0a936113ae..059b3a65ad 100755 --- a/configure +++ b/configure @@ -804,10 +804,116 @@ fi +#AC_PROG_CC +#AC_PROG_CXX + +# turn off shared libraries by default (may be enabled using --enable-shared) +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + p=${PACKAGE-default} +case "$enableval" in +yes) enable_shared=yes ;; +no) enable_shared=no ;; +*) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_shared=no +fi + +# Check whether --enable-static or --disable-static was given. +if test "${enable_static+set}" = set; then + enableval="$enable_static" + p=${PACKAGE-default} +case "$enableval" in +yes) enable_static=yes ;; +no) enable_static=no ;; +*) + enable_static=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_static=yes +fi + + +# Make sure we can run config.sub. +if $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:865: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`$ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +# Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:888: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:811: checking for $ac_word" >&5 +echo "configure:917: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -836,7 +942,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:840: checking for $ac_word" >&5 +echo "configure:946: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -884,7 +990,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:888: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -894,11 +1000,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -918,12 +1024,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:922: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:927: checking whether we are using GNU C" >&5 +echo "configure:1033: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -932,7 +1038,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -947,7 +1053,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:951: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1057: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -974,242 +1080,6 @@ else test "${CFLAGS+set}" = set || CFLAGS="-g" fi -for ac_prog in $CCC c++ g++ gcc CC cxx cc++ -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:983: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CXX="$ac_cv_prog_CXX" -if test -n "$CXX"; then - echo "$ac_t""$CXX" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$CXX" && break -done -test -n "$CXX" || CXX="gcc" - - -echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1014: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cxx_cross=no - else - ac_cv_prog_cxx_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cxx_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -if test $ac_cv_prog_cxx_works = no; then - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1054: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -cross_compiling=$ac_cv_prog_cxx_cross - -echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1059: checking whether we are using GNU C++" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes -else - ac_cv_prog_gxx=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gxx" 1>&6 - -if test $ac_cv_prog_gxx = yes; then - GXX=yes - ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1083: checking whether ${CXX-g++} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.cc -if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then - ac_cv_prog_cxx_g=yes -else - ac_cv_prog_cxx_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" - elif test $ac_cv_prog_cxx_g = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-O2" - fi -else - GXX= - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" -fi - - -# turn off shared libraries by default (may be enabled using --enable-shared) -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_shared=no -fi - -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_static=yes -fi - - -# Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1165: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`$ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1188: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -1223,7 +1093,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1227: checking for ld used by GCC" >&5 +echo "configure:1097: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1241,10 +1111,10 @@ echo "configure:1227: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1245: checking for GNU ld" >&5 +echo "configure:1115: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1248: checking for non-GNU ld" >&5 +echo "configure:1118: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1280,7 +1150,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1284: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1154: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1296,7 +1166,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1300: checking for BSD-compatible nm" >&5 +echo "configure:1170: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1333,7 +1203,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1337: checking whether ln -s works" >&5 +echo "configure:1207: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1369,8 +1239,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1373 "configure"' > conftest.$ac_ext - if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1243 "configure"' > conftest.$ac_ext + if { (eval echo configure:1244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1406,7 +1276,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1410: checking for $ac_word" >&5 +echo "configure:1280: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1440,7 +1310,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1444: checking for $ac_word" >&5 +echo "configure:1314: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1473,7 +1343,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1477: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1347: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1481,7 +1351,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1516,7 +1386,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1520: checking how to run the C preprocessor" >&5 +echo "configure:1390: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1531,13 +1401,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1548,13 +1418,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1577,7 +1447,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1581: checking lex output file root" >&5 +echo "configure:1451: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1598,7 +1468,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:1602: checking whether yytext is a pointer" >&5 +echo "configure:1472: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1610,14 +1480,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -1782,7 +1652,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1786: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1813,7 +1683,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1687: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1823,11 +1693,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1847,12 +1717,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1851: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1721: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1856: checking whether we are using GNU C++" >&5 +echo "configure:1726: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1861,7 +1731,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1876,7 +1746,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1880: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1750: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1915,7 +1785,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1919: checking for a BSD compatible install" >&5 +echo "configure:1789: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1969,7 +1839,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1973: checking for $ac_word" >&5 +echo "configure:1843: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2003,7 +1873,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2007: checking for $ac_word" >&5 +echo "configure:1877: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2090,7 +1960,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2094: checking for $ac_word" >&5 +echo "configure:1964: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2124,7 +1994,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2128: checking for $ac_word" >&5 +echo "configure:1998: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2158,7 +2028,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2162: checking for $ac_word" >&5 +echo "configure:2032: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2190,7 +2060,7 @@ test -n "$MAKE" || MAKE="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2194: checking for $ac_word" >&5 +echo "configure:2064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2222,7 +2092,7 @@ fi # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2226: checking for $ac_word" >&5 +echo "configure:2096: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2256,7 +2126,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2260: checking for $ac_word" >&5 +echo "configure:2130: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2290,7 +2160,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2294: checking for $ac_word" >&5 +echo "configure:2164: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2326,7 +2196,7 @@ if test "x$TEXPREFIX" = xauto ; then echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:2330: checking TeX/MF root dir directory" >&5 +echo "configure:2200: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -2362,16 +2232,37 @@ else find_texprefix=$TEXPREFIX fi -# if test "x$MFDIR" = xauto; then -# AC_MF_SUBDIR(MFDIR) -# fi +if test "x$MFDIR" = xauto; then + + + + echo $ac_n "checking MF input directory""... $ac_c" 1>&6 +echo "configure:2241: checking MF input directory" >&5 + find_dirdir=`(cd $find_texprefix; + $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')` + + + if test "x$find_dirdir" = x; then + find_dirdir="/source"; + + echo "configure: warning: Cannot determine MF input subdirectory. Please set from command-line" 1>&2 + warn_b=yes + + true + fi + MFDIR=$find_dirdir + echo "$ac_t""$find_texprefix/$find_dirdir" 1>&6 + + MFDIR="$TEXPREFIX/$MFDIR" + +fi if test "x$TEXDIR" = xauto ; then echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:2375: checking TeX input directory" >&5 +echo "configure:2266: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -2487,7 +2378,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2491: checking how to run the C++ preprocessor" >&5 +echo "configure:2382: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2500,12 +2391,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2525,17 +2416,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:2529: checking for FlexLexer.h" >&5 +echo "configure:2420: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2722,14 +2613,13 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g -s%@CC@%$CC%g -s%@CXX@%$CXX%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g s%@RANLIB@%$RANLIB%g +s%@CC@%$CC%g s%@LD@%$LD%g s%@NM@%$NM%g s%@LN_S@%$LN_S%g @@ -2739,6 +2629,7 @@ s%@LEX@%$LEX%g s%@LEXLIB@%$LEXLIB%g s%@CPP@%$CPP%g s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g +s%@CXX@%$CXX%g s%@TAR@%$TAR%g s%@FIND@%$FIND%g s%@ICFLAGS@%$ICFLAGS%g diff --git a/debian/Makefile.am b/debian/Makefile.am index 0268436a1c..12b5972e21 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -7,4 +7,4 @@ EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \ postinst postinst.old.sh postrm preinst rules watch $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/debian/Makefile.in b/debian/Makefile.in index b466cc2be9..8eefa73d57 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -191,7 +191,7 @@ mostlyclean distclean maintainer-clean $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/flower/Makefile.am b/flower/Makefile.am index d62df54f9d..5eeaa35c32 100644 --- a/flower/Makefile.am +++ b/flower/Makefile.am @@ -12,6 +12,9 @@ SUBDIRS = include test +# the wild-perl script needs this. +real_topdir = $(top_srcdir)/.. + lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION @@ -23,5 +26,7 @@ libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ INCLUDES = -I$(srcdir)/include +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/flower/Makefile.in b/flower/Makefile.in index 27bd4a909b..0a620aad4d 100644 --- a/flower/Makefile.in +++ b/flower/Makefile.in @@ -89,6 +89,9 @@ VERSION = @VERSION@ SUBDIRS = include test +# the wild-perl script needs this. +real_topdir = $(top_srcdir)/.. + lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION @@ -532,7 +535,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am -distclean: distclean-recursive distclean-am +distclean: distclean-recursive distclean-am distclean-local -rm -f config.status -rm -f libtool @@ -560,8 +563,10 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/flower/include/Makefile.am b/flower/include/Makefile.am index fbbb194712..5321765096 100644 --- a/flower/include/Makefile.am +++ b/flower/include/Makefile.am @@ -3,9 +3,12 @@ # Generated automatically by wild-perl 0.1 # flower/lib/include/Makefile.am.wild +# the wild-perl script needs this. +real_topdir = $(top_srcdir)/.. + noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc EXTRA_DIST = Makefile.am.wild $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in index 2dfc1914be..7de221c8e1 100644 --- a/flower/include/Makefile.in +++ b/flower/include/Makefile.in @@ -15,6 +15,8 @@ # Generated automatically by wild-perl 0.1 # flower/lib/include/Makefile.am.wild +# the wild-perl script needs this. + SHELL = /bin/sh @@ -80,6 +82,8 @@ RANLIB = @RANLIB@ REVISION = @REVISION@ VERSION = @VERSION@ +real_topdir = $(top_srcdir)/.. + noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc EXTRA_DIST = Makefile.am.wild @@ -200,7 +204,7 @@ mostlyclean distclean maintainer-clean $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/flower/test/Makefile.am b/flower/test/Makefile.am index 1aa34af387..c952130426 100644 --- a/flower/test/Makefile.am +++ b/flower/test/Makefile.am @@ -11,6 +11,9 @@ # Han-Wen Nienhuys # +# the wild-perl script needs this. +real_topdir = $(top_srcdir)/.. + # bin_PROGRAMS = test # TEST = test @@ -27,4 +30,4 @@ noinst_HEADERS = flower-test.hh INCLUDES = -I../include $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/flower/test/Makefile.in b/flower/test/Makefile.in index 9aa4333249..ef867cd485 100644 --- a/flower/test/Makefile.in +++ b/flower/test/Makefile.in @@ -23,12 +23,7 @@ # Han-Wen Nienhuys # -# bin_PROGRAMS = test - -# TEST = test - -# can't link to libflower: has not been created yet... -# test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc +# the wild-perl script needs this. SHELL = /bin/sh @@ -95,6 +90,15 @@ RANLIB = @RANLIB@ REVISION = @REVISION@ VERSION = @VERSION@ +real_topdir = $(top_srcdir)/.. + +# bin_PROGRAMS = test + +# TEST = test + +# can't link to libflower: has not been created yet... +# test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc + EXTRA_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc EXTRA_DIST = result Makefile.am.wild $(EXTRA_SOURCES) @@ -219,7 +223,7 @@ mostlyclean distclean maintainer-clean $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/init/Makefile.am b/init/Makefile.am index 31291ae66c..21e4f1a987 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -3,23 +3,23 @@ # Generated automatically by wild-perl 0.1 # init/Makefile.am.wild -INIFILES = deutsch.ly dynamic.ly engraver.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly +INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly EXTRA_DIST = Makefile.am.wild $(INIFILES) -CLEANFILES = +CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES)) -# localclean: +# clean-local: # rm -f $(TABLES) -install-data: +install-data-local: $(INSTALL) -d $(datadir)/lilypond/init $(INSTALL) -m 644 $(INIFILES) $(datadir)/lilypond/init -uninstall-data: +uninstall-local: for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/init/Makefile.in b/init/Makefile.in index b8347b24bc..29093833f3 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -99,10 +99,10 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -INIFILES = deutsch.ly dynamic.ly engraver.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly +INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly EXTRA_DIST = Makefile.am.wild $(INIFILES) -CLEANFILES = +CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES)) @@ -148,13 +148,13 @@ installcheck: install-exec: @$(NORMAL_INSTALL) -install-data: +install-data: install-data-local @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: +uninstall: uninstall-local all: Makefile @@ -195,18 +195,18 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -# localclean: +# clean-local: # rm -f $(TABLES) -install-data: +install-data-local: $(INSTALL) -d $(datadir)/lilypond/init $(INSTALL) -m 644 $(INIFILES) $(datadir)/lilypond/init -uninstall-data: +uninstall-local: for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/input/Makefile.am b/input/Makefile.am index 169a97dc68..1b6aa6bf03 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -3,7 +3,7 @@ # Generated automatically by wild-perl 0.1 # input/Makefile.am.wild -LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly tril.ly twinkle-pop.ly twinkle.ly +LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) @@ -13,4 +13,4 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/input/Makefile.in b/input/Makefile.in index e5e3228abd..b250825e4c 100644 --- a/input/Makefile.in +++ b/input/Makefile.in @@ -99,7 +99,7 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly tril.ly twinkle-pop.ly twinkle.ly +LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) @@ -197,7 +197,7 @@ mostlyclean distclean maintainer-clean default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/input/test-lyrics.ly b/input/test-lyrics.ly new file mode 100644 index 0000000000..7fb5d45daa --- /dev/null +++ b/input/test-lyrics.ly @@ -0,0 +1,10 @@ + +\score +{ + < \type Staff + \melodic { \octave c'; c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 } + \type Lyrics + \lyric { LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 } + > +} + diff --git a/lib/Makefile.am b/lib/Makefile.am index 527470b7dd..5554677441 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,5 +21,7 @@ MODULE_CXXFLAGS += -D_REENTRANT EXTRA_DIST = Makefile.am.wild +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/lib/Makefile.in b/lib/Makefile.in index 76b5a65adf..e796b2ea38 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -507,7 +507,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am -distclean: distclean-recursive distclean-am +distclean: distclean-recursive distclean-am distclean-local -rm -f config.status -rm -f libtool @@ -534,8 +534,10 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean MODULE_CXXFLAGS += -D_REENTRANT +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am index caad0633b5..25185ebf6b 100644 --- a/lib/include/Makefile.am +++ b/lib/include/Makefile.am @@ -8,4 +8,4 @@ noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-stor EXTRA_DIST = Makefile.am.wild $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in index d265d91c2d..2efb0f8fc0 100644 --- a/lib/include/Makefile.in +++ b/lib/include/Makefile.in @@ -218,7 +218,7 @@ mostlyclean distclean maintainer-clean $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lily/Makefile.am b/lily/Makefile.am index b245e5a9c6..7262ac7da7 100644 --- a/lily/Makefile.am +++ b/lily/Makefile.am @@ -16,7 +16,7 @@ bin_PROGRAMS = lilypond # ignoring wildcards for `lexer.cc' # ignoring wildcards for `parser.cc' -lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy +lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy noinst_HEADERS = parser.hh #lilypond_LDADD = -llily -lflower @LEXLIB@ @@ -24,9 +24,6 @@ lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs - - - INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION @@ -51,5 +48,7 @@ all-am: Makefile $(PROGRAMS) wild-check # dummy target for non-GNU makes; is overridden in GNUmakefile wild-check: +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/lily/Makefile.in b/lily/Makefile.in index 7440c2f3e8..f847d9f7f3 100644 --- a/lily/Makefile.in +++ b/lily/Makefile.in @@ -112,7 +112,7 @@ bin_PROGRAMS = lilypond # ignoring wildcards for `lexer.cc' # ignoring wildcards for `parser.cc' -lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy +lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy noinst_HEADERS = parser.hh #lilypond_LDADD = -llily -lflower @LEXLIB@ @@ -141,29 +141,31 @@ beam-swallow-trans.o beam.o bow.o boxes.o break-align-item.o break.o \ change-iterator.o change-translator.o chord-iterator.o clef-grav.o \ clef-item.o col-info.o colhpos.o collision-grav.o collision.o \ command-request.o crescendo.o debug.o dimen.o directional-spanner.o \ -dot-column-grav.o dot-column.o dots.o dynamic-grav.o elem-group.o \ -engraver-group.o engraver.o general-script-def.o global-translator.o \ -gourlay-breaking.o graphical-element.o grouping.o head-grav.o header.o \ -horizontal-align-item.o horizontal-group-item.o \ -horizontal-vertical-group-item.o idealspacing.o identifier.o \ -ineq-constrained-qp.o item.o key-grav.o key-item.o key-performer.o \ -key.o keyword.o leastsquares.o lexerinit.o lily-version.o \ -line-group-grav.o line-spacer.o linear-programming.o local-key-grav.o \ -local-key-item.o lookup.o lyric-grav.o lyric-performer.o main.o \ -meter-grav.o meter-performer.o meter.o midi-def.o midi-item.o \ -midi-stream.o midi-walker.o misc.o molecule.o music-iterator.o \ -music-list.o music-output-def.o music.o musical-request.o \ -my-lily-lexer.o my-lily-parser.o note-column.o note-head.o \ -note-performer.o note.o notename-table.o offset.o outputter.o p-col.o \ -p-score.o paper-def.o performance.o performer-group-performer.o \ -performer.o pitch-squash-grav.o plet-engraver.o plet-spanner.o \ -plet-swallow-engraver.o priority-halign-grav.o property-iterator.o \ -ps-plet.o qlp.o qlpsolve.o request-iterator.o request.o \ -rest-collision-grav.o rest-collision.o rest-grav.o rest.o \ -rhythmic-column-grav.o rhythmic-head.o score-bar.o score-column.o \ -score-elem-info.o score-elem.o score-grav.o score-performer.o \ -score-priority-grav.o score.o scoreline.o scores.o script-column.o \ -script-def.o script-grav.o script.o slur-grav.o slur.o span-bar-grav.o \ +dot-column-grav.o dot-column.o dots.o dynamic-grav.o engraver-group.o \ +engraver.o general-script-def.o global-translator.o gourlay-breaking.o \ +graphical-element.o grouping.o head-grav.o header.o \ +horizontal-align-item.o horizontal-group-elem.o horizontal-group-item.o \ +horizontal-vertical-group-elem.o horizontal-vertical-group-item.o \ +idealspacing.o identifier.o ineq-constrained-qp.o item.o key-grav.o \ +key-item.o key-performer.o key.o keyword.o leastsquares.o lexerinit.o \ +lily-version.o line-group-grav.o line-spacer.o linear-programming.o \ +local-key-grav.o local-key-item.o lookup.o lyric-grav.o \ +lyric-performer.o main.o meter-grav.o meter-performer.o meter.o \ +midi-def.o midi-item.o midi-stream.o midi-walker.o misc.o molecule.o \ +music-iterator.o music-list.o music-output-def.o music.o \ +musical-request.o my-lily-lexer.o my-lily-parser.o note-column.o \ +note-head.o note-performer.o note.o notename-table.o offset.o \ +outputter.o p-col.o p-score.o paper-def.o performance.o \ +performer-group-performer.o performer.o pitch-squash-grav.o \ +plet-engraver.o plet-spanner.o plet-swallow-engraver.o \ +priority-halign-grav.o property-iterator.o ps-plet.o qlp.o qlpsolve.o \ +request-iterator.o request.o rest-collision-grav.o rest-collision.o \ +rest-grav.o rest.o rhythmic-column-grav.o rhythmic-head.o rod.o \ +score-bar.o score-column.o score-elem-info.o score-elem.o score-grav.o \ +score-performer.o score-priority-grav.o score.o scoreline.o scores.o \ +script-column.o script-def.o script-grav.o script.o \ +separating-group-spanner.o separating-line-group-grav.o \ +single-malt-grouping-item.o slur-grav.o slur.o span-bar-grav.o \ span-bar.o span-score-bar-grav.o span-score-bar.o spanner.o \ spring-spacer.o staff-info.o staff-performer.o staff-side.o \ staff-sym-grav.o staff-sym.o stem-grav.o stem-info.o stem.o \ @@ -174,8 +176,8 @@ text-item.o text-spanner.o tie-grav.o tie.o time-description.o \ timing-grav.o timing-translator.o translation-property.o \ translator-ctors.o translator-group.o translator.o type-swallow-trans.o \ version.o vertical-align-elem.o vertical-align-grav.o \ -vertical-align-spanner.o vertical-group-spanner.o voice-iterator.o \ -warn.o word-wrap.o lexer.o parser.o +vertical-align-spanner.o vertical-group-elem.o vertical-group-spanner.o \ +voice-iterator.o warn.o word-wrap.o lexer.o parser.o lilypond_DEPENDENCIES = $(top_builddir)/lib/liblily.la \ $(top_builddir)/flower/libflower.la LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -389,7 +391,7 @@ abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.hh \ include/direction.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/beam.hh include/directional-spanner.hh \ - include/spanner.hh ../flower/include/plist.hh \ + include/spanner.hh include/rod.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ @@ -429,9 +431,11 @@ abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/abbreviation-beam.hh include/beam.hh \ include/directional-spanner.hh include/spanner.hh \ - include/musical-request.hh include/misc.hh include/grouping.hh + include/rod.hh include/musical-request.hh include/misc.hh \ + include/grouping.hh abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -443,7 +447,7 @@ abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -451,7 +455,7 @@ abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/dimen.hh \ + ../flower/include/plist.icc include/rod.hh include/dimen.hh \ include/abbreviation-beam.hh include/beam.hh \ include/directional-spanner.hh include/spanner.hh \ include/misc.hh ../lib/include/moment.hh \ @@ -579,12 +583,12 @@ axis-group-item.o: axis-group-item.cc include/axis-group-item.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh ../flower/include/plist.hh \ + include/horizontal-group-elem.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc + ../flower/include/plist.icc include/rod.hh axis-group-spanner.o: axis-group-spanner.cc \ include/axis-group-spanner.hh include/spanner.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -599,16 +603,17 @@ axis-group-spanner.o: axis-group-spanner.cc \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/axis-group-element.hh \ + include/direction.hh include/rod.hh \ + include/axis-group-element.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-item.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc axis.o: axis.cc include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -636,7 +641,9 @@ bar-column-grav.o: bar-column-grav.cc include/bar-column-grav.hh \ include/score-elem.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ include/axis-group-administration.hh include/item.hh \ - include/boxes.hh include/drul-array.hh include/elem-group.hh \ + include/boxes.hh include/drul-array.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/script.hh include/staff-side.hh include/bar.hh bar-column.o: bar-column.cc include/bar.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ @@ -655,7 +662,9 @@ bar-column.o: bar-column.cc include/bar.hh include/item.hh \ include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -758,10 +767,10 @@ beam-grav.o: beam-grav.cc ../lib/include/duration-convert.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/beam.hh include/directional-spanner.hh \ - include/spanner.hh include/musical-request.hh \ + include/spanner.hh include/rod.hh include/musical-request.hh \ include/grouping.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh beam-swallow-trans.o: beam-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ @@ -781,8 +790,9 @@ beam-swallow-trans.o: beam-swallow-trans.cc \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -792,7 +802,7 @@ beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -800,9 +810,9 @@ beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/dimen.hh include/beam.hh \ - include/directional-spanner.hh include/spanner.hh \ - include/abbreviation-beam.hh include/misc.hh \ + ../flower/include/plist.icc include/rod.hh include/dimen.hh \ + include/beam.hh include/directional-spanner.hh \ + include/spanner.hh include/abbreviation-beam.hh include/misc.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/scalar.hh include/grouping.hh \ include/minterval.hh include/debug.hh \ @@ -825,7 +835,7 @@ bow.o: bow.cc include/bow.hh include/directional-spanner.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/paper-def.hh \ + include/direction.hh include/rod.hh include/paper-def.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/music-output-def.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -843,35 +853,35 @@ boxes.o: boxes.cc include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh break-align-item.o: break-align-item.cc include/break-align-item.hh \ - include/horizontal-align-item.hh include/elem-group.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ - ../flower/include/virtual-methods.hh \ - ../flower/include/directed-graph.hh \ - include/graphical-element.hh include/offset.hh \ - ../flower/include/real.hh include/axes.hh \ + include/horizontal-align-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ - ../flower/include/fproto.hh ../flower/include/string-handle.hh \ - ../flower/include/international.hh ../flower/include/compare.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/item.hh \ - include/boxes.hh include/drul-array.hh include/direction.hh + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh break.o: break.cc include/score-column.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -879,14 +889,14 @@ break.o: break.cc include/score-column.hh include/lily-proto.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/break.hh include/colhpos.hh \ - include/paper-def.hh include/music-output-def.hh \ - ../flower/include/dictionary.hh ../flower/include/assoc.hh \ - include/line-spacer.hh ../flower/include/vector.hh \ - include/debug.hh ../flower/include/dstream.hh \ - ../lib/include/warn.hh include/scoreline.hh include/spanner.hh \ - include/p-score.hh include/music-output.hh \ - ../flower/include/cpu-timer.hh + ../flower/include/plist.icc include/rod.hh include/break.hh \ + include/colhpos.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/line-spacer.hh \ + ../flower/include/vector.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh \ + include/scoreline.hh include/spanner.hh include/p-score.hh \ + include/music-output.hh ../flower/include/cpu-timer.hh change-iterator.o: change-iterator.cc include/change-iterator.hh \ include/music-iterator.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -995,7 +1005,8 @@ clef-item.o: clef-item.cc include/clef-item.hh include/item.hh \ include/score-elem-info.hh include/staff-info.hh \ include/translator.hh col-info.o: col-info.cc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -1007,7 +1018,7 @@ col-info.o: col-info.cc include/p-col.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -1015,9 +1026,10 @@ col-info.o: col-info.cc include/p-col.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/col-info.hh \ - ../flower/include/pointer.hh include/debug.hh \ - ../flower/include/dstream.hh ../lib/include/warn.hh + ../flower/include/plist.icc include/rod.hh include/col-info.hh \ + ../flower/include/pointer.hh ../flower/include/assoc.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh colhpos.o: colhpos.cc include/colhpos.hh ../flower/include/varray.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1044,7 +1056,9 @@ collision-grav.o: collision-grav.cc include/note-column.hh \ include/direction.hh include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/collision-grav.hh include/engraver.hh \ include/request.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../lib/include/input.hh \ @@ -1071,17 +1085,18 @@ collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/interval.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/direction.hh \ - include/elem-group.hh include/note-column.hh \ - include/script-column.hh include/note-head.hh \ - include/rhythmic-head.hh include/paper-def.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - include/music-output-def.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/dictionary.hh \ - ../flower/include/assoc.hh + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/note-column.hh include/script-column.hh \ + include/note-head.hh include/rhythmic-head.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh command-request.o: command-request.cc include/command-request.hh \ include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -1115,15 +1130,15 @@ crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/spanner.hh \ - include/drul-array.hh include/lookup.hh include/atom.hh \ - ../flower/include/scalar.hh include/paper-def.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - include/music-output-def.hh ../flower/include/dictionary.hh \ - ../flower/include/assoc.hh include/debug.hh \ - ../flower/include/dstream.hh ../lib/include/warn.hh \ - include/score-column.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/drul-array.hh include/rod.hh include/lookup.hh \ + include/atom.hh ../flower/include/scalar.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/score-column.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \ @@ -1158,7 +1173,7 @@ directional-spanner.o: directional-spanner.cc \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh + include/direction.hh include/rod.hh dot-column-grav.o: dot-column-grav.cc dot-column.o: dot-column.cc include/dots.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ @@ -1174,8 +1189,8 @@ dot-column.o: dot-column.cc include/dots.hh include/item.hh \ include/graphical-element.hh include/lily-proto.hh \ ../lib/include/proto.hh include/drul-array.hh \ include/direction.hh include/dot-column.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/rhythmic-head.hh dots.o: dots.cc include/dots.hh include/item.hh include/boxes.hh \ @@ -1214,7 +1229,7 @@ dynamic-grav.o: dynamic-grav.cc include/debug.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ ../flower/include/interval.hh include/direction.hh \ - include/spanner.hh include/drul-array.hh \ + include/spanner.hh include/drul-array.hh include/rod.hh \ include/dynamic-grav.hh include/engraver.hh include/request.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../lib/include/input.hh include/music.hh include/minterval.hh \ @@ -1232,11 +1247,13 @@ dynamic-grav.o: dynamic-grav.cc include/debug.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/score-column.hh \ include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/axis-group-element.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/staff-sym.hh include/note-column.hh \ include/script-column.hh \ - include/horizontal-vertical-group-item.hh + include/horizontal-vertical-group-item.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh elem-group.o: elem-group.cc include/elem-group.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -1344,23 +1361,23 @@ gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/col-info.hh ../flower/include/pointer.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/assoc.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/warn.hh \ include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ - include/direction.hh include/p-score.hh include/music-output.hh \ - include/paper-def.hh include/music-output-def.hh \ - ../flower/include/dictionary.hh ../flower/include/assoc.hh + include/direction.hh include/rod.hh include/p-score.hh \ + include/music-output.hh include/paper-def.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh graphical-element.o: graphical-element.cc include/graphical-element.hh \ include/offset.hh ../flower/include/real.hh include/axes.hh \ ../flower/include/string.hh \ @@ -1423,7 +1440,23 @@ header.o: header.cc ../flower/include/string.hh \ ../flower/include/varray.hh ../flower/include/dictionary.hh \ include/header.hh horizontal-align-item.o: horizontal-align-item.cc \ - include/horizontal-align-item.hh include/elem-group.hh \ + include/horizontal-align-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh +horizontal-group-elem.o: horizontal-group-elem.cc \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -1435,13 +1468,14 @@ horizontal-align-item.o: horizontal-align-item.cc \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -1453,7 +1487,7 @@ horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -1461,7 +1495,27 @@ horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc + ../flower/include/plist.icc include/rod.hh +horizontal-vertical-group-elem.o: horizontal-vertical-group-elem.cc \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh \ + include/horizontal-group-elem.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ @@ -1479,19 +1533,22 @@ horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \ ../flower/include/interval.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/direction.hh \ - include/elem-group.hh include/p-col.hh \ - include/horizontal-group-item.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/rod.hh idealspacing.o: idealspacing.cc include/idealspacing.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -1499,7 +1556,7 @@ idealspacing.o: idealspacing.cc include/idealspacing.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -1507,7 +1564,7 @@ idealspacing.o: idealspacing.cc include/idealspacing.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/p-score.hh \ + ../flower/include/plist.icc include/rod.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \ @@ -1570,10 +1627,10 @@ item.o: item.cc include/p-score.hh include/colhpos.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/drul-array.hh \ include/direction.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ - include/spanner.hh + include/rod.hh include/spanner.hh key-grav.o: key-grav.cc include/key-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1706,12 +1763,14 @@ line-group-grav.o: line-group-grav.cc include/staff-sym.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/vertical-group-spanner.hh \ - include/axis-group-spanner.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ - include/command-request.hh include/request.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../lib/include/input.hh include/music.hh include/minterval.hh \ + include/direction.hh include/rod.hh \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh include/command-request.hh \ + include/request.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/bar.hh include/item.hh include/boxes.hh \ include/debug.hh ../flower/include/dstream.hh \ @@ -1720,7 +1779,8 @@ line-group-grav.o: line-group-grav.cc include/staff-sym.hh \ ../flower/include/scalar.hh include/staff-info.hh \ include/translator.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/p-col.hh \ - include/horizontal-group-item.hh include/axis-group-item.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ ../flower/include/link.hh ../flower/include/link.icc \ @@ -1758,7 +1818,7 @@ local-key-grav.o: local-key-grav.cc include/musical-request.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/key-item.hh include/tie.hh include/bow.hh \ include/directional-spanner.hh include/spanner.hh \ - include/note-head.hh include/rhythmic-head.hh \ + include/rod.hh include/note-head.hh include/rhythmic-head.hh \ include/time-description.hh local-key-item.o: local-key-item.cc include/dimen.hh \ ../flower/include/real.hh ../flower/include/string.hh \ @@ -2209,7 +2269,8 @@ my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.hh \ include/command-request.hh parser.hh include/header.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh note-column.o: note-column.cc include/dot-column.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -2221,12 +2282,14 @@ note-column.o: note-column.cc include/dot-column.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh include/note-column.hh \ include/script-column.hh \ - include/horizontal-vertical-group-item.hh include/script.hh \ + include/horizontal-vertical-group-item.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/script.hh \ include/staff-side.hh include/note-head.hh \ include/rhythmic-head.hh include/stem.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -2346,8 +2409,9 @@ outputter.o: outputter.cc include/outputter.hh include/lily-proto.hh \ include/direction.hh ../flower/include/varray.hh \ include/dimen.hh include/tex.hh ../flower/include/scalar.hh p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -2357,7 +2421,7 @@ p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -2365,7 +2429,7 @@ p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/p-score.hh \ + ../flower/include/plist.icc include/rod.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh p-score.o: p-score.cc include/main.hh include/lily-proto.hh \ @@ -2384,24 +2448,24 @@ p-score.o: p-score.cc include/main.hh include/lily-proto.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/lookup.hh include/atom.hh include/boxes.hh \ ../flower/include/scalar.hh include/direction.hh \ - include/spanner.hh include/drul-array.hh include/paper-def.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - include/music-output-def.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/dictionary.hh \ - ../flower/include/assoc.hh include/scoreline.hh \ - include/colhpos.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/spanner.hh include/drul-array.hh include/rod.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/scoreline.hh include/colhpos.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/p-score.hh include/music-output.hh \ include/tex-stream.hh include/header.hh include/word-wrap.hh \ include/break.hh include/gourlay-breaking.hh \ - include/outputter.hh ../flower/include/plist.tcc \ - ../flower/include/pcursor.tcc + include/outputter.hh ../flower/include/list.tcc \ + ../flower/include/cursor.tcc paper-def.o: paper-def.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2576,15 +2640,16 @@ plet-engraver.o: plet-engraver.cc ../lib/include/proto.hh \ include/directional-spanner.hh include/spanner.hh \ include/score-elem.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/text-def.hh include/general-script-def.hh \ - include/beam.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/score-column.hh \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/axis-group-element.hh \ + include/rod.hh include/text-def.hh \ + include/general-script-def.hh include/beam.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/score-column.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/stem.hh \ include/molecule.hh @@ -2606,18 +2671,20 @@ plet-spanner.o: plet-spanner.cc include/atom.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ - include/graphical-element.hh include/axis-group-element.hh \ + include/graphical-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ - include/item.hh include/drul-array.hh include/paper-def.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - include/music-output-def.hh ../flower/include/dictionary.hh \ - ../flower/include/assoc.hh include/plet-spanner.hh \ - include/bow.hh include/directional-spanner.hh \ - include/spanner.hh include/stem.hh include/text-def.hh \ + include/item.hh include/drul-array.hh include/rod.hh \ + include/paper-def.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh include/music-output-def.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + include/plet-spanner.hh include/bow.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/stem.hh include/text-def.hh \ include/general-script-def.hh ../lib/include/input.hh plet-swallow-engraver.o: plet-swallow-engraver.cc \ include/musical-request.hh include/lily-proto.hh \ @@ -2652,9 +2719,7 @@ priority-halign-grav.o: priority-halign-grav.cc include/bar.hh \ include/graphical-element.hh include/lily-proto.hh \ ../lib/include/proto.hh include/drul-array.hh \ include/direction.hh include/break-align-item.hh \ - include/horizontal-align-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ - include/axis-group-administration.hh \ + include/horizontal-align-item.hh \ include/priority-halign-grav.hh include/engraver.hh \ include/request.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../lib/include/input.hh \ @@ -2789,7 +2854,9 @@ rest-collision-grav.o: rest-collision-grav.cc include/debug.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/collision.hh include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/note-column.hh include/script-column.hh rest-collision.o: rest-collision.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ @@ -2809,7 +2876,9 @@ rest-collision.o: rest-collision.cc include/debug.hh \ include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/stem.hh ../lib/include/moment.hh \ ../flower/include/rational.hh include/molecule.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -2899,7 +2968,9 @@ rhythmic-column-grav.o: rhythmic-column-grav.cc \ include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/script.hh include/staff-side.hh include/dot-column.hh \ include/horizontal-group-item.hh rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \ @@ -2930,6 +3001,30 @@ rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh +rod.o: rod.cc include/rod.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/direction.hh \ + include/drul-array.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/debug.hh \ + ../flower/include/dstream.hh ../lib/include/warn.hh score-bar.o: score-bar.cc include/score-bar.hh include/bar.hh \ include/item.hh include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ @@ -2952,13 +3047,14 @@ score-column.o: score-column.cc include/debug.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -2966,8 +3062,9 @@ score-column.o: score-column.cc include/debug.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/score-column.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh + ../flower/include/plist.icc include/rod.hh \ + include/score-column.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh score-elem-info.o: score-elem-info.cc include/score-elem-info.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -3005,9 +3102,10 @@ score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.hh \ include/graphical-element.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/tex.hh include/dimen.hh include/spanner.hh \ - include/drul-array.hh include/scoreline.hh include/item.hh \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/axis-group-element.hh \ + include/drul-array.hh include/rod.hh include/scoreline.hh \ + include/item.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ @@ -3022,7 +3120,7 @@ score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/interval.hh include/scoreline.hh \ include/colhpos.hh include/spanner.hh include/drul-array.hh \ - include/direction.hh include/debug.hh \ + include/direction.hh include/rod.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/item.hh include/boxes.hh include/score-grav.hh \ include/engraver-group.hh ../flower/include/plist.hh \ @@ -3041,8 +3139,8 @@ score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \ include/p-score.hh include/music-output.hh \ include/musical-request.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/score-column.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/command-request.hh include/paper-def.hh \ include/music-output-def.hh @@ -3079,7 +3177,8 @@ score-performer.o: score-performer.cc include/score-performer.hh \ ../lib/include/source-file.hh ../lib/include/source.hh \ include/audio-staff.hh score-priority-grav.o: score-priority-grav.cc \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -3091,7 +3190,7 @@ score-priority-grav.o: score-priority-grav.cc \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh include/score-priority-grav.hh \ @@ -3142,17 +3241,18 @@ scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/dimen.hh include/atom.hh \ - include/boxes.hh include/paper-def.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh include/music-output-def.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - ../flower/include/dictionary.hh ../flower/include/assoc.hh \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/axis-group-element.hh \ + include/direction.hh include/rod.hh include/dimen.hh \ + include/atom.hh include/boxes.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/p-score.hh include/music-output.hh scores.o: scores.cc include/main.hh include/lily-proto.hh \ @@ -3192,10 +3292,11 @@ script-column.o: script-column.cc include/script-column.hh \ ../flower/include/interval.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/direction.hh \ - include/elem-group.hh include/debug.hh \ - ../flower/include/dstream.hh ../lib/include/warn.hh \ - include/script.hh include/staff-side.hh include/note-head.hh \ - include/rhythmic-head.hh include/stem.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/script.hh include/staff-side.hh \ + include/note-head.hh include/rhythmic-head.hh include/stem.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/molecule.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -3251,7 +3352,7 @@ script-grav.o: script-grav.cc include/script-grav.hh include/engraver.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/staff-sym.hh include/spanner.hh \ + include/staff-sym.hh include/spanner.hh include/rod.hh \ include/general-script-def.hh script.o: script.cc include/script-def.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -3279,6 +3380,86 @@ script.o: script.cc include/script-def.hh ../flower/include/string.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/stem.hh include/molecule.hh include/lookup.hh \ include/atom.hh ../flower/include/scalar.hh +separating-group-spanner.o: separating-group-spanner.cc \ + include/separating-group-spanner.hh \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../flower/include/interval.hh include/drul-array.hh \ + include/direction.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh \ + include/single-malt-grouping-item.hh include/item.hh \ + include/boxes.hh +separating-line-group-grav.o: separating-line-group-grav.cc \ + include/separating-line-group-grav.hh \ + include/line-group-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + include/music.hh include/minterval.hh \ + ../flower/include/interval.hh include/direction.hh \ + include/score-elem-info.hh ../flower/include/scalar.hh \ + include/staff-info.hh include/translator.hh \ + ../flower/include/dictionary.hh ../flower/include/assoc.hh \ + ../flower/include/parray.hh include/separating-group-spanner.hh \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/score-elem.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + include/drul-array.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh \ + include/single-malt-grouping-item.hh include/item.hh \ + include/boxes.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc +single-malt-grouping-item.o: single-malt-grouping-item.cc \ + include/single-malt-grouping-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/drul-array.hh \ + include/direction.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/rod.hh slur-grav.o: slur-grav.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -3306,13 +3487,15 @@ slur-grav.o: slur-grav.cc ../lib/include/proto.hh \ include/spanner.hh include/score-elem.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/drul-array.hh include/bow.hh include/debug.hh \ - ../flower/include/dstream.hh ../lib/include/warn.hh \ - include/note-column.hh include/item.hh include/boxes.hh \ - include/script-column.hh \ + include/drul-array.hh include/rod.hh include/bow.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/note-column.hh include/item.hh \ + include/boxes.hh include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh slur.o: slur.cc include/slur.hh include/directional-spanner.hh \ include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -3326,9 +3509,9 @@ slur.o: slur.cc include/slur.hh include/directional-spanner.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/bow.hh ../flower/include/scalar.hh \ - include/lookup.hh include/atom.hh include/boxes.hh \ - include/paper-def.hh ../lib/include/moment.hh \ + include/direction.hh include/rod.hh include/bow.hh \ + ../flower/include/scalar.hh include/lookup.hh include/atom.hh \ + include/boxes.hh include/paper-def.hh ../lib/include/moment.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3339,7 +3522,9 @@ slur.o: slur.cc include/slur.hh include/directional-spanner.hh \ include/note-column.hh include/item.hh include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ + include/axis-group-administration.hh \ + include/horizontal-vertical-group-elem.hh \ + include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/stem.hh include/molecule.hh include/p-col.hh \ include/horizontal-group-item.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh @@ -3364,9 +3549,7 @@ span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/vertical-align-spanner.hh include/spanner.hh \ - include/vertical-align-elem.hh include/elem-group.hh \ - include/axis-group-element.hh \ - include/axis-group-administration.hh + include/rod.hh include/vertical-align-elem.hh span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -3390,9 +3573,7 @@ span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/molecule.hh \ - include/vertical-align-elem.hh include/elem-group.hh \ - include/axis-group-element.hh \ - include/axis-group-administration.hh + include/vertical-align-elem.hh span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.hh \ include/span-bar.hh include/bar.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ @@ -3452,9 +3633,9 @@ spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/direction.hh include/rod.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -3474,28 +3655,29 @@ spring-spacer.o: spring-spacer.cc include/spring-spacer.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/col-info.hh \ - ../flower/include/pointer.hh include/colhpos.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/pointer.hh ../flower/include/assoc.hh \ + include/colhpos.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh \ - include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ - include/direction.hh include/debug.hh \ + include/direction.hh include/rod.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/qlp.hh include/ineq-constrained-qp.hh \ ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \ ../flower/include/unionfind.hh include/idealspacing.hh \ ../flower/include/pointer.tcc include/score-column.hh \ include/paper-def.hh include/music-output-def.hh \ - ../flower/include/dictionary.hh ../flower/include/assoc.hh \ - include/dimen.hh include/main.hh + ../flower/include/dictionary.hh include/dimen.hh \ + include/main.hh staff-info.o: staff-info.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -3508,17 +3690,18 @@ staff-info.o: staff-info.cc ../lib/include/proto.hh \ ../flower/include/varray.hh ../lib/include/moment.hh \ ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ - include/direction.hh + include/direction.hh include/rod.hh staff-performer.o: staff-performer.cc include/staff-performer.hh \ include/performer-group-performer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -3565,7 +3748,7 @@ staff-side.o: staff-side.cc ../flower/include/interval.hh \ ../flower/include/parray.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ include/direction.hh include/staff-sym.hh include/spanner.hh \ - include/drul-array.hh include/debug.hh \ + include/drul-array.hh include/rod.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \ include/engraver.hh include/lily-proto.hh \ @@ -3586,14 +3769,14 @@ staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \ include/spanner.hh include/score-elem.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/drul-array.hh include/score.hh \ + include/drul-array.hh include/rod.hh include/score.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/axis-group-element.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \ @@ -3609,8 +3792,8 @@ staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/lookup.hh include/atom.hh \ - include/boxes.hh ../flower/include/scalar.hh \ + include/direction.hh include/rod.hh include/lookup.hh \ + include/atom.hh include/boxes.hh ../flower/include/scalar.hh \ include/paper-def.hh ../lib/include/moment.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -3703,12 +3886,13 @@ stem.o: stem.cc include/stem.hh include/item.hh include/boxes.hh \ ../flower/include/assoc.hh include/note-head.hh \ include/rhythmic-head.hh include/lookup.hh include/atom.hh \ ../flower/include/scalar.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/axis-group-element.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ - include/misc.hh include/grouping.hh include/minterval.hh \ - include/beam.hh include/directional-spanner.hh \ - include/spanner.hh include/rest.hh + include/rod.hh include/misc.hh include/grouping.hh \ + include/minterval.hh include/beam.hh \ + include/directional-spanner.hh include/spanner.hh \ + include/rest.hh super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -3722,7 +3906,7 @@ super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/interval.hh include/scoreline.hh \ include/colhpos.hh include/spanner.hh include/drul-array.hh \ - include/direction.hh include/p-score.hh \ + include/direction.hh include/rod.hh include/p-score.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ ../flower/include/link.hh ../flower/include/link.icc \ @@ -3785,7 +3969,8 @@ template1.o: template1.cc ../lib/include/proto.hh \ ../flower/include/compare.hh ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -3795,10 +3980,10 @@ template1.o: template1.cc ../lib/include/proto.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ - include/direction.hh include/musical-request.hh \ + include/direction.hh include/rod.hh include/musical-request.hh \ include/request.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../lib/include/input.hh \ include/music.hh include/minterval.hh \ @@ -3838,22 +4023,7 @@ template4.o: template4.cc ../lib/include/proto.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/compare.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/audio-item.hh \ - include/lily-proto.hh ../flower/include/string.hh \ - ../flower/include/arithmetic-operator.hh \ - ../flower/include/string-handle.hh \ - ../flower/include/international.hh include/audio-element.hh \ - ../flower/include/virtual-methods.hh include/audio-staff.hh \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - ../flower/include/directed-graph.hh \ - include/graphical-element.hh include/offset.hh include/axes.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/axis-group-item.hh \ - include/item.hh include/boxes.hh include/drul-array.hh \ - include/direction.hh include/p-score.hh include/colhpos.hh \ - include/music-output.hh ../flower/include/cursor.tcc \ + ../flower/include/plist.icc ../flower/include/cursor.tcc \ ../flower/include/list.tcc ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc template5.o: template5.cc ../lib/include/proto.hh \ @@ -4051,13 +4221,13 @@ text-spanner.o: text-spanner.cc include/molecule.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/drul-array.hh \ - include/text-def.hh include/general-script-def.hh \ - ../lib/include/input.hh include/debug.hh \ - ../flower/include/dstream.hh ../lib/include/warn.hh \ - include/paper-def.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh include/music-output-def.hh \ - ../flower/include/dictionary.hh ../flower/include/assoc.hh \ - include/atom.hh + include/rod.hh include/text-def.hh \ + include/general-script-def.hh ../lib/include/input.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh include/paper-def.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + include/music-output-def.hh ../flower/include/dictionary.hh \ + ../flower/include/assoc.hh include/atom.hh tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -4077,7 +4247,7 @@ tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \ include/directional-spanner.hh include/spanner.hh \ include/score-elem.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/drul-array.hh include/note-head.hh \ + include/drul-array.hh include/rod.hh include/note-head.hh \ include/rhythmic-head.hh include/item.hh include/boxes.hh \ include/musical-request.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/music-list.hh \ @@ -4106,10 +4276,11 @@ tie.o: tie.cc include/paper-def.hh include/lily-proto.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/drul-array.hh include/direction.hh include/note-head.hh \ - include/rhythmic-head.hh include/item.hh include/boxes.hh \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/axis-group-element.hh \ + include/drul-array.hh include/direction.hh include/rod.hh \ + include/note-head.hh include/rhythmic-head.hh include/item.hh \ + include/boxes.hh include/p-col.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh @@ -4266,9 +4437,8 @@ version.o: version.cc include/main.hh include/lily-proto.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh vertical-align-elem.o: vertical-align-elem.cc \ - include/vertical-align-elem.hh include/elem-group.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ + include/vertical-align-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -4278,10 +4448,10 @@ vertical-align-elem.o: vertical-align-elem.cc \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ - include/axis-group-administration.hh + ../flower/include/interval.hh vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -4293,7 +4463,7 @@ vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/interval.hh include/axis-group-element.hh \ + ../flower/include/interval.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh ../flower/include/plist.hh \ @@ -4301,15 +4471,16 @@ vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \ ../flower/include/cursor.hh ../flower/include/link.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/vertical-align-grav.hh \ - include/engraver.hh include/request.hh ../lib/include/moment.hh \ + ../flower/include/plist.icc include/rod.hh \ + include/vertical-align-grav.hh include/engraver.hh \ + include/request.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../lib/include/input.hh \ include/music.hh include/minterval.hh \ include/score-elem-info.hh ../flower/include/scalar.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/vertical-align-spanner.hh include/spanner.hh \ - include/vertical-align-elem.hh + include/vertical-align-elem.hh include/vertical-group-elem.hh vertical-align-spanner.o: vertical-align-spanner.cc \ include/vertical-align-spanner.hh include/spanner.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -4324,9 +4495,26 @@ vertical-align-spanner.o: vertical-align-spanner.cc \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/vertical-align-elem.hh \ - include/elem-group.hh include/axis-group-element.hh \ - include/axis-group-administration.hh + include/direction.hh include/rod.hh \ + include/vertical-align-elem.hh +vertical-group-elem.o: vertical-group-elem.cc \ + include/vertical-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ + ../flower/include/virtual-methods.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh \ + ../flower/include/real.hh include/axes.hh \ + ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/interval.hh \ + include/axis-group-administration.hh include/item.hh \ + include/boxes.hh include/drul-array.hh include/direction.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../lib/include/warn.hh vertical-group-spanner.o: vertical-group-spanner.cc \ include/vertical-group-spanner.hh include/axis-group-spanner.hh \ include/spanner.hh include/lily-proto.hh \ @@ -4341,10 +4529,12 @@ vertical-group-spanner.o: vertical-group-spanner.cc \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ - include/direction.hh include/axis-group-element.hh \ - include/axis-group-administration.hh include/elem-group.hh \ - include/item.hh include/boxes.hh include/p-col.hh \ - include/horizontal-group-item.hh include/axis-group-item.hh \ + include/direction.hh include/rod.hh \ + include/axis-group-element.hh \ + include/axis-group-administration.hh \ + include/vertical-group-elem.hh include/item.hh include/boxes.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-item.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ ../flower/include/link.hh ../flower/include/link.icc \ @@ -4411,13 +4601,13 @@ word-wrap.o: word-wrap.cc include/word-wrap.hh include/break.hh \ ../flower/include/parray.hh include/music-output.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ + include/horizontal-group-item.hh \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ - include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ - include/direction.hh include/spring-spacer.hh \ + include/direction.hh include/rod.hh include/spring-spacer.hh \ include/line-spacer.hh ../flower/include/vector.hh \ include/col-info.hh ../flower/include/pointer.hh @@ -4484,7 +4674,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am -distclean: distclean-recursive distclean-am +distclean: distclean-recursive distclean-am distclean-local -rm -f config.status -rm -f libtool @@ -4529,8 +4719,10 @@ all-am: Makefile $(PROGRAMS) wild-check # dummy target for non-GNU makes; is overridden in GNUmakefile wild-check: +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am index 33cc6f410a..bcef2c017f 100644 --- a/lily/include/Makefile.am +++ b/lily/include/Makefile.am @@ -3,9 +3,9 @@ # Generated automatically by wild-perl 0.1 # lily/include/Makefile.am.wild -noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc +noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc EXTRA_DIST = Makefile.am.wild $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in index 7da93c0656..b51e7448b8 100644 --- a/lily/include/Makefile.in +++ b/lily/include/Makefile.in @@ -99,7 +99,7 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc +noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc EXTRA_DIST = Makefile.am.wild mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -218,7 +218,7 @@ mostlyclean distclean maintainer-clean $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/make/Makefile.am b/make/Makefile.am index ec0a09f422..76713abe78 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -36,4 +36,4 @@ lilypond.spec: lilypond.spec.in ../VERSION cat $< | $(SED_VERSION) | $(SED_DATE) > $@ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/make/Makefile.in b/make/Makefile.in index cbd578ad79..0d96b7effb 100644 --- a/make/Makefile.in +++ b/make/Makefile.in @@ -220,7 +220,7 @@ lilypond.spec: lilypond.spec.in ../VERSION cat $< | $(SED_VERSION) | $(SED_DATE) > $@ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 4718bdc78e..df611c045a 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond Versie: -Inschrijf datum: 27MAR98 +Inschrijf datum: 31MAR98 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 0b8664a06b..6b44b2b0dd 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond Version: -Entered-date: 27MAR98 +Entered-date: 31MAR98 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music diff --git a/make/lilypond.spec b/make/lilypond.spec index 1d9ea56f92..da643e9d46 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -32,7 +32,7 @@ make -C Documentation gifs make prefix="$RPM_BUILD_ROOT/usr" install %files %doc Documentation/AUTHORS.txt Documentation/CodingStyle.txt Documentation/INSTALL.txt Documentation/MANIFESTO.txt Documentation/PATCHES.txt Documentation/convert-mudela.txt Documentation/faq.txt Documentation/gnu-music.txt Documentation/index.txt Documentation/internals.txt Documentation/language.txt Documentation/lilypond.txt Documentation/links.txt Documentation/literature.txt Documentation/ly2dvi.txt Documentation/mi2mu.txt Documentation/mudela-book.txt Documentation/mutopia.txt Documentation/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc +%doc input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc %doc Documentation/out/lelie_logo.gif /usr/bin/convert-mudela /usr/bin/mudela-book diff --git a/mf/Makefile.am b/mf/Makefile.am index 91a0273e89..625a9a8808 100644 --- a/mf/Makefile.am +++ b/mf/Makefile.am @@ -25,21 +25,34 @@ texout = $(depth)/tex LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly)) TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex)) -default: all $(LYTABLES) $(TEXTABLES) -localclean: - rm -f $(LYTABLES) $(TEXTABLES) +all-local: $(LYTABLES) $(TEXTABLES) -localrealclean: - rm -f $(MFDEPS) +dist-hook: $(LYTABLES) $(TEXTABLES) -localinstall: +clean-local: + -rm -f $(LYTABLES) $(TEXTABLES) + -rm -f *.log + +distclean-local: + -rm -f $(MFDEPS) + +install-data-local: $(INSTALL) -d $(MFDIR)/public/lilypond + $(INSTALL) -d $(TEXDIR)/lilypond + $(INSTALL) -d $(datadir)/lilypond/init $(INSTALL) -m 644 $(MFFILES) $(MFDIR)/public/lilypond/ + $(INSTALL) -m 644 $(TEXTABLES) $(TEXDIR)/lilypond + $(INSTALL) -m 644 $(LYTABLES) $(datadir)/lilypond/init/ -localuninstall: - for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done - -rmdir $(MFDIR)/public/lilypond/ +uninstall-local: + for i in $(MFFILES) ; do rm -f $(MFDIR)/public/lilypond/$$i; done + for i in $(TEXTABLES) ; do rm -f $(TEXDIR)/lilypond/$$i; done + for i in $LYTABLES) ; do rm -f $(datadir)/lilypond/init/$$i; done + -rmdir $(MFDIR)/public/lilypond + -rmdir $(TEXDIR)/lilypond + -rmdir $(datadir)/lilypond/init + -rmdir $(datadir)/lilypond include $(srcdir)/Rules.make @@ -47,6 +60,5 @@ include $(srcdir)/Rules.make # include $(MFDEPS) # - $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/mf/Makefile.in b/mf/Makefile.in index c107b24b5d..d756398758 100644 --- a/mf/Makefile.in +++ b/mf/Makefile.in @@ -155,6 +155,7 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done + $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook info: dvi: check: all @@ -163,15 +164,15 @@ installcheck: install-exec: @$(NORMAL_INSTALL) -install-data: +install-data: install-data-local @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: +uninstall: uninstall-local -all: Makefile +all: Makefile all-local install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install @@ -194,9 +195,9 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic -clean: clean-generic mostlyclean +clean: clean-generic mostlyclean clean-local -distclean: distclean-generic clean +distclean: distclean-generic clean distclean-local -rm -f config.status -rm -f libtool @@ -210,21 +211,33 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -default: all $(LYTABLES) $(TEXTABLES) +all-local: $(LYTABLES) $(TEXTABLES) -localclean: - rm -f $(LYTABLES) $(TEXTABLES) +dist-hook: $(LYTABLES) $(TEXTABLES) -localrealclean: - rm -f $(MFDEPS) +clean-local: + -rm -f $(LYTABLES) $(TEXTABLES) + -rm -f *.log -localinstall: +distclean-local: + -rm -f $(MFDEPS) + +install-data-local: $(INSTALL) -d $(MFDIR)/public/lilypond + $(INSTALL) -d $(TEXDIR)/lilypond + $(INSTALL) -d $(datadir)/lilypond/init $(INSTALL) -m 644 $(MFFILES) $(MFDIR)/public/lilypond/ - -localuninstall: - for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done - -rmdir $(MFDIR)/public/lilypond/ + $(INSTALL) -m 644 $(TEXTABLES) $(TEXDIR)/lilypond + $(INSTALL) -m 644 $(LYTABLES) $(datadir)/lilypond/init/ + +uninstall-local: + for i in $(MFFILES) ; do rm -f $(MFDIR)/public/lilypond/$$i; done + for i in $(TEXTABLES) ; do rm -f $(TEXDIR)/lilypond/$$i; done + for i in $LYTABLES) ; do rm -f $(datadir)/lilypond/init/$$i; done + -rmdir $(MFDIR)/public/lilypond + -rmdir $(TEXDIR)/lilypond + -rmdir $(datadir)/lilypond/init + -rmdir $(datadir)/lilypond include $(srcdir)/Rules.make @@ -232,9 +245,8 @@ include $(srcdir)/Rules.make # include $(MFDEPS) # - $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am index 2b98699c08..bffa487cb2 100644 --- a/mi2mu/Makefile.am +++ b/mi2mu/Makefile.am @@ -13,7 +13,7 @@ SUBDIRS = include bin_PROGRAMS = mi2mu -mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc +mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template9.cc version.cc # ugh -lfl bo lib/FlexLexer stuff #mi2mu_LDADD = -llily -lflower -lfl @@ -31,5 +31,8 @@ all-am: Makefile $(PROGRAMS) wild-check # dummy target for non-GNU makes; is overridden in GNUmakefile wild-check: + +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in index 4401cee22f..61945fc469 100644 --- a/mi2mu/Makefile.in +++ b/mi2mu/Makefile.in @@ -109,7 +109,7 @@ SUBDIRS = include bin_PROGRAMS = mi2mu -mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc +mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template9.cc version.cc # ugh -lfl bo lib/FlexLexer stuff #mi2mu_LDADD = -llily -lflower -lfl @@ -131,8 +131,8 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ mi2mu_OBJECTS = main.o mi2mu-version.o midi-parser.o \ midi-score-parser.o midi-track-parser.o mudela-column.o mudela-item.o \ -mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o template.o \ -version.o +mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o \ +template9.o version.o mi2mu_DEPENDENCIES = $(top_builddir)/lib/liblily.la \ $(top_builddir)/flower/libflower.la mi2mu_LDFLAGS = @@ -429,7 +429,8 @@ mudela-score.o: mudela-score.cc ../lib/include/moment.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/mudela-item.hh include/mudela-score.hh \ ../flower/include/parray.hh include/mudela-staff.hh \ - include/mudela-stream.hh + include/mudela-stream.hh ../flower/include/list.tcc \ + ../flower/include/cursor.tcc mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ @@ -493,6 +494,25 @@ template.o: template.cc ../lib/include/proto.hh \ ../lib/include/plet.hh include/mudela-column.hh \ include/mudela-staff.hh include/mudela-voice.hh \ ../flower/include/plist.tcc +template9.o: template9.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/plist.icc ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/list.tcc \ + ../flower/include/cursor.tcc include/mudela-item.hh \ + include/mi2mu-proto.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../lib/include/duration.hh \ + ../lib/include/plet.hh include/mudela-column.hh \ + include/mudela-staff.hh include/mudela-voice.hh \ + include/mudela-score.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc version.o: version.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ @@ -563,7 +583,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am -distclean: distclean-recursive distclean-am +distclean: distclean-recursive distclean-am distclean-local -rm -f config.status -rm -f libtool @@ -593,8 +613,11 @@ all-am: Makefile $(PROGRAMS) wild-check # dummy target for non-GNU makes; is overridden in GNUmakefile wild-check: + +distclean-local: + -rm -rf .deps $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am index 63032f9bbf..ca22f222b5 100644 --- a/mi2mu/include/Makefile.am +++ b/mi2mu/include/Makefile.am @@ -8,4 +8,4 @@ noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser EXTRA_DIST = Makefile.am.wild $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in index 10a1bfd137..cb19558093 100644 --- a/mi2mu/include/Makefile.in +++ b/mi2mu/include/Makefile.in @@ -218,7 +218,7 @@ mostlyclean distclean maintainer-clean $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am index bf2a5e5cd6..f61b263308 100644 --- a/mutopia/J.S.Bach/Makefile.am +++ b/mutopia/J.S.Bach/Makefile.am @@ -13,4 +13,4 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in index 8e8f9f535c..79863de42f 100644 --- a/mutopia/J.S.Bach/Makefile.in +++ b/mutopia/J.S.Bach/Makefile.in @@ -197,7 +197,7 @@ mostlyclean distclean maintainer-clean default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am index 836601b477..25d76365b6 100644 --- a/mutopia/Makefile.am +++ b/mutopia/Makefile.am @@ -14,4 +14,4 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in index dc925d97cd..aaf6dca564 100644 --- a/mutopia/Makefile.in +++ b/mutopia/Makefile.in @@ -285,7 +285,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean default: all $(OUTFILES) $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tex/Makefile.am b/tex/Makefile.am index c8167ad27b..927786c873 100644 --- a/tex/Makefile.am +++ b/tex/Makefile.am @@ -3,17 +3,17 @@ # Generated automatically by wild-perl 0.1 # tex/Makefile.am.wild -TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) -CLEANFILES = +CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex -install-data: +install-data-local: $(INSTALL) -d $(TEXDIR)/lilypond $(INSTALL) -m 644 $(TEXFILES) $(TEXDIR)/lilypond/ -uninstall-data: +uninstall-local: for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done -rmdir $(TEXDIR)/lilypond/ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ \ No newline at end of file diff --git a/tex/Makefile.in b/tex/Makefile.in index 09c27e4382..96a0f96933 100644 --- a/tex/Makefile.in +++ b/tex/Makefile.in @@ -99,10 +99,10 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) -CLEANFILES = +CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = @@ -145,13 +145,13 @@ installcheck: install-exec: @$(NORMAL_INSTALL) -install-data: +install-data: install-data-local @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: +uninstall: uninstall-local all: Makefile @@ -192,15 +192,15 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -install-data: +install-data-local: $(INSTALL) -d $(TEXDIR)/lilypond $(INSTALL) -m 644 $(TEXFILES) $(TEXDIR)/lilypond/ -uninstall-data: +uninstall-local: for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done -rmdir $(TEXDIR)/lilypond/ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.39.5