lilypond-0.1.50

diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
index 9e8347dcaea65f8ac4c779bdb1e0795d8338eefe..0c9c750b9352fa9b5235561be6d5185acc4833da 100644 (file)
--- a/Documentation/Makefile.in
+++ b/Documentation/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./Documentation/Makefile.am.wild by bin/autowild
-# Do not edit
-# Documentation/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# Documentation/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -146,6 +156,7 @@ install-exec:
 
 install-data: 
        @$(NORMAL_INSTALL)
+       $(MAKE) install-data-hook
 
 install: install-exec install-data all
        @:
@@ -160,25 +171,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -192,14 +204,20 @@ mostlyclean distclean maintainer-clean
 
 default: all $(TEXTFILES)
 
-install-data: $(outdir)/lilypond.1
+install-data-hook: $(MAN1GROFF)
        $(INSTALL) -d $(mandir)/man1
        $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
 
-uninstall-data:
+uninstall-hook:
        (cd  $(mandir)/man1/; rm -f $(MAN1GROFF))
 
-include Rules.make
+html: $(HTMLFILES)
+
+clean-hook:
+       rm $(TEXTFILES) $(MAN1GROFF)
+
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
 
 # 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.in b/Makefile.in
index 0827df92a205690d0f49e0fee5746bfceddb23df..bcf8a0234a6d0728942c9d2d55fc57390747ffda 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,19 +1,18 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./flower/Makefile.am.wild by bin/autowild
-# Do not edit
-# project  FlowerSoft C++ library
-# title           top level makefile for FlowerLib
-# file    flower/Makefile.am.wild
-#
-# Copyright (c) 1997 by    
-#      Jan Nieuwenhuizen <jan@digicash.com>
-#      Han-Wen Nienhuys <hanwen@stack.nl>
-#              ...your sort order here, or how to comment-out a comment
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
+# title           top level makefile for LilyPond  
+# file    Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,78 +46,79 @@ ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AUTOHEADER = @AUTOHEADER@
+BISON = @BISON@
 CC = @CC@
+COMPILEINFO = @COMPILEINFO@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-LIB_SUFFIX = @LIB_SUFFIX@
+CXXFLAGS = @CXXFLAGS@
+DEFINES = @DEFINES@
+DIR_DATADIR = @DIR_DATADIR@
+EXTRA_LIBES = @EXTRA_LIBES@
+FIND = @FIND@
+FLEX = @FLEX@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
+LD = @LD@
+LEX = @LEX@
+LIBTOOL = @LIBTOOL@
+LN = @LN@
+LN_S = @LN_S@
+MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
-MODULE_CXXFLAGS = @MODULE_CXXFLAGS@
-MODULE_LDFLAGS = @MODULE_LDFLAGS@
+MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
+POD2HTML = @POD2HTML@
+POD2MAN = @POD2MAN@
+PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+TAR = @TAR@
+TEXDIR = @TEXDIR@
+TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
+YACC = @YACC@
+ZIP = @ZIP@
 
-SUBDIRS = include test 
-
-lib_LIBRARIES = libflower.a
-# lib_LIBRARIES = libflower.la
+SUBDIRS = bin flower lib lily mf mi2mu debian\
+       Documentation init input tex make mutopia
 
-README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES)
-
-libflower_a_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc
-
-INCLUDES = -Iinclude
+SCHRIFTEN = configure configure.in install-sh aclocal.m4
+README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
+ COPYING ONEWS NEWS README TODO \
+ INSTALL AUTHORS PATCHES
+EXTRA_DIST = Makefile.am.wild .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = config.hh
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ./lib/config.hh
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(lib_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libflower_a_LIBADD = 
-libflower_a_OBJECTS =  choleski.o cpu-timer.o data-file.o \
-diagonal-storage.o dictionary.o directed-graph.o dstream.o \
-flower-debug.o flower-version.o full-storage.o interval.o lgetopt.o \
-libc-extension.o matrix-debug.o matrix-storage.o matrix.o nscalar.o \
-path.o rational.o scalar.o string-convert.o string.o stringutil.o \
-text-db.o text-stream.o unionfind.o vector.o
-AR = ar
-CXXFLAGS = @CXXFLAGS@
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO aclocal.m4 config.hh.in configure configure.in \
-missing mkinstalldirs stamp-h.in
+Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \
+configure configure.in install-sh ltconfig ltmain.sh missing \
+mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP = --best
-SOURCES = $(libflower_a_SOURCES)
-OBJECTS = $(libflower_a_OBJECTS)
-
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .o
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
 
@@ -126,7 +126,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4):  configure.in 
+$(ACLOCAL_M4):  configure.in  acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure
@@ -134,78 +134,6 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-config.hh: stamp-h
-stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
-       cd $(top_builddir) \
-         && CONFIG_FILES= CONFIG_HEADERS=config.hh:config.hh.in \
-            $(SHELL) ./config.status
-       @echo timestamp > stamp-h
-$(srcdir)/config.hh.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOHEADER)
-       @echo timestamp > $(srcdir)/stamp-h.in
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-       rm -f config.hh
-
-maintainer-clean-hdr:
-
-mostlyclean-libLIBRARIES:
-
-clean-libLIBRARIES:
-       test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-
-distclean-libLIBRARIES:
-
-maintainer-clean-libLIBRARIES:
-
-install-libLIBRARIES: $(lib_LIBRARIES)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(libdir)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \
-           $(INSTALL_DATA) $$p $(libdir)/$$p; \
-         else :; fi; \
-       done
-       @$(POST_INSTALL)
-       @list='$(lib_LIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(RANLIB) $(libdir)/$$p"; \
-           $(RANLIB) $(libdir)/$$p; \
-         else :; fi; \
-       done
-
-uninstall-libLIBRARIES:
-       $(NORMAL_UNINSTALL)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
-         rm -f $(libdir)/$$p; \
-       done
-
-.c.o:
-       $(COMPILE) -c $<
-
-mostlyclean-compile:
-       rm -f *.o core
-
-clean-compile:
-
-distclean-compile:
-       rm -f *.tab.c
-
-maintainer-clean-compile:
-
-libflower.a: $(libflower_a_OBJECTS) $(libflower_a_DEPENDENCIES)
-       rm -f libflower.a
-       $(AR) cru libflower.a $(libflower_a_OBJECTS) $(libflower_a_LIBADD)
-       $(RANLIB) libflower.a
-.cc.o:
-       $(CXXCOMPILE) -c $<
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -219,7 +147,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
@@ -229,7 +157,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+       done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
@@ -243,24 +173,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -271,7 +206,7 @@ top_distdir = $(distdir)
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
        GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
@@ -284,20 +219,20 @@ distcheck: dist
          && $(MAKE) install \
          && $(MAKE) installcheck \
          && $(MAKE) dist
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
        @echo "========================"; \
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"
 dist: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
 dist-all: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
 distdir: $(DISTFILES)
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)
        @for file in $(DISTFILES); do \
@@ -306,209 +241,102 @@ distdir: $(DISTFILES)
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
-         (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
+         (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-choleski.o choleski.lo: choleski.cc include/choleski.hh \
-       include/matrix.hh include/matrix-storage.hh include/varray.hh \
-       include/real.hh include/virtual-methods.hh include/vector.hh
-cpu-timer.o cpu-timer.lo: cpu-timer.cc include/cpu-timer.hh \
-       include/real.hh
-data-file.o data-file.lo: data-file.cc include/international.hh \
-       include/data-file.hh include/text-stream.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh include/compare.hh \
-       include/varray.hh
-diagonal-storage.o diagonal-storage.lo: diagonal-storage.cc \
-       include/diagonal-storage.hh include/full-storage.hh \
-       include/varray.hh include/matrix-storage.hh include/real.hh \
-       include/virtual-methods.hh include/full-storage.icc
-dictionary.o dictionary.lo: dictionary.cc
-directed-graph.o directed-graph.lo: directed-graph.cc \
-       include/directed-graph.hh include/parray.hh include/varray.hh
-dstream.o dstream.lo: dstream.cc include/assoc.hh include/varray.hh \
-       include/dstream.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh include/scalar.hh \
-       include/text-db.hh include/data-file.hh include/text-stream.hh \
-       include/string-convert.hh include/assoc-iter.hh
-flower-debug.o flower-debug.lo: flower-debug.cc include/flower-debug.hh \
-       include/dstream.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh
-flower-version.o flower-version.lo: flower-version.cc config.hh
-full-storage.o full-storage.lo: full-storage.cc include/full-storage.hh \
-       include/varray.hh include/matrix-storage.hh include/real.hh \
-       include/virtual-methods.hh include/full-storage.icc
-interval.o interval.lo: interval.cc include/interval.hh \
-       include/fproto.hh include/real.hh include/compare.hh \
-       include/interval.tcc include/string.hh \
-       include/arithmetic-operator.hh include/string-handle.hh \
-       include/international.hh include/flower-debug.hh \
-       include/dstream.hh
-lgetopt.o lgetopt.lo: lgetopt.cc include/lgetopt.hh \
-       include/international.hh
-libc-extension.o libc-extension.lo: libc-extension.cc \
-       include/libc-extension.hh include/fproto.hh include/real.hh \
-       config.hh
-matrix-debug.o matrix-debug.lo: matrix-debug.cc include/flower-debug.hh \
-       include/dstream.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh include/matrix.hh \
-       include/matrix-storage.hh include/varray.hh \
-       include/virtual-methods.hh include/vector.hh
-matrix-storage.o matrix-storage.lo: matrix-storage.cc \
-       include/full-storage.hh include/varray.hh \
-       include/matrix-storage.hh include/real.hh \
-       include/virtual-methods.hh include/diagonal-storage.hh
-matrix.o matrix.lo: matrix.cc include/matrix.hh \
-       include/matrix-storage.hh include/varray.hh include/real.hh \
-       include/virtual-methods.hh include/vector.hh \
-       include/full-storage.hh include/diagonal-storage.hh
-nscalar.o nscalar.lo: nscalar.cc
-path.o path.lo: path.cc include/path.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh include/varray.hh \
-       include/flower-debug.hh include/dstream.hh
-rational.o rational.lo: rational.cc include/rational.hh \
-       include/compare.hh include/arithmetic-operator.hh \
-       include/fproto.hh include/real.hh include/string.hh \
-       include/string-handle.hh include/international.hh \
-       include/string-convert.hh include/libc-extension.hh config.hh
-scalar.o scalar.lo: scalar.cc include/scalar.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh include/rational.hh
-string-convert.o string-convert.lo: string-convert.cc \
-       include/libc-extension.hh include/fproto.hh include/real.hh \
-       config.hh include/string.hh include/arithmetic-operator.hh \
-       include/string-handle.hh include/international.hh \
-       include/compare.hh include/string-convert.hh \
-       include/rational.hh
-string.o string.lo: string.cc include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh \
-       include/libc-extension.hh config.hh include/string-convert.hh
-stringutil.o stringutil.lo: stringutil.cc include/string-handle.hh \
-       include/fproto.hh include/real.hh include/string-data.hh \
-       include/string.hh include/arithmetic-operator.hh \
-       include/international.hh include/compare.hh \
-       include/string-data.icc include/string-handle.icc \
-       include/string.icc
-text-db.o text-db.lo: text-db.cc include/text-db.hh include/data-file.hh \
-       include/text-stream.hh include/string.hh \
-       include/arithmetic-operator.hh include/fproto.hh \
-       include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh include/varray.hh
-text-stream.o text-stream.lo: text-stream.cc include/text-stream.hh \
-       include/string.hh include/arithmetic-operator.hh \
-       include/fproto.hh include/real.hh include/string-handle.hh \
-       include/international.hh include/compare.hh include/varray.hh
-unionfind.o unionfind.lo: unionfind.cc include/unionfind.hh \
-       include/varray.hh
-vector.o vector.lo: vector.cc include/vector.hh include/real.hh \
-       include/varray.hh
-
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
        $(MAKE) check-recursive
 installcheck: installcheck-recursive
-all-recursive-am: config.hh
-       $(MAKE) all-recursive
-
-all-am: Makefile $(LIBRARIES) config.hh
-
-install-exec-am: install-libLIBRARIES
+all-am: Makefile
 
-uninstall-am: uninstall-libLIBRARIES
-
-install-exec: install-exec-recursive install-exec-am
+install-exec: install-exec-recursive
        @$(NORMAL_INSTALL)
 
 install-data: install-data-recursive
        @$(NORMAL_INSTALL)
 
-install: install-recursive install-exec-am
+install: install-recursive
        @:
 
-uninstall: uninstall-recursive uninstall-am
+uninstall: uninstall-recursive
 
-all: all-recursive-am all-am
+all: all-recursive all-am
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
-       $(mkinstalldirs)  $(libdir)
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
-               mostlyclean-compile mostlyclean-tags \
-               mostlyclean-generic
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
-clean-am:  clean-hdr clean-libLIBRARIES clean-compile clean-tags \
-               clean-generic mostlyclean-am
+clean-am:  clean-tags clean-generic mostlyclean-am
 
-distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
-               distclean-tags distclean-generic clean-am
+distclean-am:  distclean-tags distclean-generic clean-am
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
-               maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+               distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
 
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
-       rm -f config.status
-
-.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
-maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \
-clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
-install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+       -rm -f config.status
+
+.PHONY: default install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec-am uninstall-am \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+installcheck all-am install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+INSTALL:
+       rm -f INSTALL
+       ln `$(FIND) ./ -name INSTALL.txt -print | head -1` $@
+
+AUTHORS:
+       rm -f AUTHORS
+       ln `$(FIND) ./ -name AUTHORS.txt -print | head -1` $@
+
+PATCHES:
+       rm -f PATCHES
+       ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@
+
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/bin/Makefile.in b/bin/Makefile.in
index edff79e6a3ca50de1f1dbfcac5ac7be39fdea3b0..775180c1d22b3a0664b1f9006fa40e56ebb26a26 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,14 +1,19 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./bin/Makefile.am.wild by bin/autowild
-# Do not edit
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
 # bin/Makefile
 
-# bin_SCRIPTS = Makefile.in add-URLs.in clean-diaper.in clean-embeds.in clean-fonts.in conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in
+# bin_SCRIPTS = 
 
 
 SHELL = /bin/sh
@@ -49,12 +54,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -69,11 +76,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -87,9 +98,9 @@ VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
 
-PAREL_SCHRIFTEN = flower.py lilypython.py
-IN_SCHRIFTEN = flower.py lilypython.py
-EXTRA_DIST = Makefile.am.wild autowild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl
+PAREL_SCHRIFTEN = 
+IN_SCHRIFTEN = 
+EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../lib/config.hh
 CONFIG_CLEAN_FILES =  add-URLs clean-diaper clean-embeds clean-fonts \
@@ -200,25 +211,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -230,6 +242,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/debian/Makefile.in b/debian/Makefile.in
index 22e578be0e98f6c2b5cdb0103807a86eb7443ae7..42ec05cfb840823bef2a99cda6764e4b3a33770c 100644 (file)
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./debian/Makefile.am.wild by bin/autowild
-# Do not edit
-# debian/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# debian/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -145,25 +155,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -175,6 +186,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/flower/Makefile.in b/flower/Makefile.in
index 4d725bd52061ae7ff29c060bc0479378d48b2cfb..d3d3612e89082c57b81cd7ecb231fc5d9159777c 100644 (file)
--- a/flower/Makefile.in
+++ b/flower/Makefile.in
@@ -1,11 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./flower/Makefile.am.wild by bin/autowild
-# Do not edit
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
 # project  FlowerSoft C++ library
 # title           top level makefile for FlowerLib
 # file    flower/Makefile.am.wild
@@ -54,55 +59,67 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AGE = @AGE@
 CC = @CC@
+CURRENT = @CURRENT@
 CXX = @CXX@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
 LIB_SUFFIX = @LIB_SUFFIX@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MODULE_CXXFLAGS = @MODULE_CXXFLAGS@
 MODULE_LDFLAGS = @MODULE_LDFLAGS@
+NM = @NM@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 VERSION = @VERSION@
 
 SUBDIRS = include test 
 
-lib_LIBRARIES = libflower.a
-# lib_LIBRARIES = libflower.la
+lib_LTLIBRARIES = libflower.la
 
 README_FILES = ONEWS NEWS README TODO VERSION
 EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES)
 
-libflower_a_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc
+libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc
+
+libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
 
-INCLUDES = -Iinclude
+INCLUDES = -I$(srcdir)/include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.hh
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(lib_LIBRARIES)
+LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libflower_a_LIBADD = 
-libflower_a_OBJECTS =  choleski.o cpu-timer.o data-file.o \
-diagonal-storage.o dictionary.o directed-graph.o dstream.o \
-flower-debug.o flower-version.o full-storage.o interval.o lgetopt.o \
-libc-extension.o matrix-debug.o matrix-storage.o matrix.o nscalar.o \
-path.o rational.o scalar.o string-convert.o string.o stringutil.o \
-text-db.o text-stream.o unionfind.o vector.o
-AR = ar
+libflower_la_LIBADD = 
+libflower_la_OBJECTS =  choleski.lo cpu-timer.lo data-file.lo \
+diagonal-storage.lo dictionary.lo directed-graph.lo dstream.lo \
+flower-debug.lo flower-version.lo full-storage.lo interval.lo \
+lgetopt.lo libc-extension.lo matrix-debug.lo matrix-storage.lo \
+matrix.lo nscalar.lo path.lo rational.lo scalar.lo string-convert.lo \
+string.lo stringutil.lo text-db.lo text-stream.lo unionfind.lo \
+vector.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS TODO aclocal.m4 config.hh.in configure configure.in \
 missing mkinstalldirs stamp-h.in
@@ -112,26 +129,17 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-DEP_FILES =  .deps/choleski.P .deps/cpu-timer.P .deps/data-file.P \
-.deps/diagonal-storage.P .deps/dictionary.P .deps/directed-graph.P \
-.deps/dstream.P .deps/flower-debug.P .deps/flower-version.P \
-.deps/full-storage.P .deps/interval.P .deps/lgetopt.P \
-.deps/libc-extension.P .deps/matrix-debug.P .deps/matrix-storage.P \
-.deps/matrix.P .deps/nscalar.P .deps/path.P .deps/rational.P \
-.deps/scalar.P .deps/string-convert.P .deps/string.P .deps/stringutil.P \
-.deps/text-db.P .deps/text-stream.P .deps/unionfind.P .deps/vector.P
-CXXMKDEP = $(CXX) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-SOURCES = $(libflower_a_SOURCES)
-OBJECTS = $(libflower_a_OBJECTS)
+SOURCES = $(libflower_la_SOURCES)
+OBJECTS = $(libflower_la_OBJECTS)
 
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .o
+.SUFFIXES: .S .c .cc .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -144,6 +152,7 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCI
        cd $(srcdir) && $(AUTOCONF)
 
 config.hh: stamp-h
+       @:
 stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES= CONFIG_HEADERS=config.hh:config.hh.in \
@@ -159,61 +168,79 @@ mostlyclean-hdr:
 clean-hdr:
 
 distclean-hdr:
-       rm -f config.hh
+       -rm -f config.hh
 
 maintainer-clean-hdr:
 
-mostlyclean-libLIBRARIES:
+mostlyclean-libLTLIBRARIES:
 
-clean-libLIBRARIES:
-       test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 
-distclean-libLIBRARIES:
+distclean-libLTLIBRARIES:
 
-maintainer-clean-libLIBRARIES:
+maintainer-clean-libLTLIBRARIES:
 
-install-libLIBRARIES: $(lib_LIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(libdir)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \
-           $(INSTALL_DATA) $$p $(libdir)/$$p; \
-         else :; fi; \
-       done
-       @$(POST_INSTALL)
-       @list='$(lib_LIBRARIES)'; for p in $$list; do \
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(RANLIB) $(libdir)/$$p"; \
-           $(RANLIB) $(libdir)/$$p; \
+           echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \
+           $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \
          else :; fi; \
        done
 
-uninstall-libLIBRARIES:
-       $(NORMAL_UNINSTALL)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
-         rm -f $(libdir)/$$p; \
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
        done
 
 .c.o:
        $(COMPILE) -c $<
 
+.s.o:
+       $(COMPILE) -c $<
+
+.S.o:
+       $(COMPILE) -c $<
+
 mostlyclean-compile:
-       rm -f *.o core
+       -rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-       rm -f *.tab.c
+       -rm -f *.tab.c
 
 maintainer-clean-compile:
 
-libflower.a: $(libflower_a_OBJECTS) $(libflower_a_DEPENDENCIES)
-       rm -f libflower.a
-       $(AR) cru libflower.a $(libflower_a_OBJECTS) $(libflower_a_LIBADD)
-       $(RANLIB) libflower.a
+.c.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+libflower.la: $(libflower_la_OBJECTS) $(libflower_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(libflower_la_LDFLAGS) $(libflower_la_OBJECTS) $(libflower_la_LIBADD) $(LIBS)
 .cc.o:
        $(CXXCOMPILE) -c $<
+.cc.lo:
+       $(LTCXXCOMPILE) -c $<
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -228,7 +255,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
@@ -238,7 +265,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+       done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
@@ -252,24 +281,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -280,7 +314,7 @@ top_distdir = $(distdir)
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
        GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
@@ -293,73 +327,141 @@ distcheck: dist
          && $(MAKE) install \
          && $(MAKE) installcheck \
          && $(MAKE) dist
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
        @echo "========================"; \
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"
 dist: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
 dist-all: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
 distdir: $(DISTFILES)
-       rm -rf $(distdir)
+       -rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)
-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
-         (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
+         (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
+choleski.lo choleski.o: choleski.cc include/choleski.hh \
+       include/matrix.hh include/matrix-storage.hh include/varray.hh \
+       include/real.hh include/virtual-methods.hh include/vector.hh
+cpu-timer.lo cpu-timer.o: cpu-timer.cc include/cpu-timer.hh \
+       include/real.hh
+data-file.lo data-file.o: data-file.cc include/international.hh \
+       include/data-file.hh include/text-stream.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh include/compare.hh \
+       include/varray.hh
+diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \
+       include/diagonal-storage.hh include/full-storage.hh \
+       include/varray.hh include/matrix-storage.hh include/real.hh \
+       include/virtual-methods.hh include/full-storage.icc
+dictionary.lo dictionary.o: dictionary.cc
+directed-graph.lo directed-graph.o: directed-graph.cc \
+       include/directed-graph.hh include/parray.hh include/varray.hh
+dstream.lo dstream.o: dstream.cc include/assoc.hh include/varray.hh \
+       include/dstream.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh include/scalar.hh \
+       include/text-db.hh include/data-file.hh include/text-stream.hh \
+       include/string-convert.hh include/assoc-iter.hh
+flower-debug.lo flower-debug.o: flower-debug.cc include/flower-debug.hh \
+       include/dstream.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh
+flower-version.lo flower-version.o: flower-version.cc config.hh
+full-storage.lo full-storage.o: full-storage.cc include/full-storage.hh \
+       include/varray.hh include/matrix-storage.hh include/real.hh \
+       include/virtual-methods.hh include/full-storage.icc
+interval.lo interval.o: interval.cc include/interval.hh \
+       include/fproto.hh include/real.hh include/compare.hh \
+       include/interval.tcc include/string.hh \
+       include/arithmetic-operator.hh include/string-handle.hh \
+       include/international.hh include/flower-debug.hh \
+       include/dstream.hh
+lgetopt.lo lgetopt.o: lgetopt.cc include/lgetopt.hh \
+       include/international.hh
+libc-extension.lo libc-extension.o: libc-extension.cc \
+       include/libc-extension.hh include/fproto.hh include/real.hh \
+       config.hh
+matrix-debug.lo matrix-debug.o: matrix-debug.cc include/flower-debug.hh \
+       include/dstream.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh include/matrix.hh \
+       include/matrix-storage.hh include/varray.hh \
+       include/virtual-methods.hh include/vector.hh
+matrix-storage.lo matrix-storage.o: matrix-storage.cc \
+       include/full-storage.hh include/varray.hh \
+       include/matrix-storage.hh include/real.hh \
+       include/virtual-methods.hh include/diagonal-storage.hh
+matrix.lo matrix.o: matrix.cc include/matrix.hh \
+       include/matrix-storage.hh include/varray.hh include/real.hh \
+       include/virtual-methods.hh include/vector.hh \
+       include/full-storage.hh include/diagonal-storage.hh
+nscalar.lo nscalar.o: nscalar.cc
+path.lo path.o: path.cc include/path.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh include/varray.hh \
+       include/flower-debug.hh include/dstream.hh
+rational.lo rational.o: rational.cc include/rational.hh \
+       include/compare.hh include/arithmetic-operator.hh \
+       include/fproto.hh include/real.hh include/string.hh \
+       include/string-handle.hh include/international.hh \
+       include/string-convert.hh include/libc-extension.hh config.hh
+scalar.lo scalar.o: scalar.cc include/scalar.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh include/rational.hh
+string-convert.lo string-convert.o: string-convert.cc \
+       include/libc-extension.hh include/fproto.hh include/real.hh \
+       config.hh include/string.hh include/arithmetic-operator.hh \
+       include/string-handle.hh include/international.hh \
+       include/compare.hh include/string-convert.hh \
+       include/rational.hh
+string.lo string.o: string.cc include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh \
+       include/libc-extension.hh config.hh include/string-convert.hh
+stringutil.lo stringutil.o: stringutil.cc include/string-handle.hh \
+       include/fproto.hh include/real.hh include/string-data.hh \
+       include/string.hh include/arithmetic-operator.hh \
+       include/international.hh include/compare.hh \
+       include/string-data.icc include/string-handle.icc \
+       include/string.icc
+text-db.lo text-db.o: text-db.cc include/text-db.hh include/data-file.hh \
+       include/text-stream.hh include/string.hh \
+       include/arithmetic-operator.hh include/fproto.hh \
+       include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh include/varray.hh
+text-stream.lo text-stream.o: text-stream.cc include/text-stream.hh \
+       include/string.hh include/arithmetic-operator.hh \
+       include/fproto.hh include/real.hh include/string-handle.hh \
+       include/international.hh include/compare.hh include/varray.hh
+unionfind.lo unionfind.o: unionfind.cc include/unionfind.hh \
+       include/varray.hh
+vector.lo vector.o: vector.cc include/vector.hh include/real.hh \
+       include/varray.hh
 
-MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
-       echo > $@
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-
-maintainer-clean-depend:
-       rm -rf .deps
-
-.deps/%.P: %.c
-       @echo "Computing dependencies for $<..."
-       @o='o'; \
-       test -n "$o" && o='$$o'; \
-       $(MKDEP) $< >$@.tmp \
-         && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
-         && rm -f $@.tmp
-
-.deps/%.P: %.cc
-       @echo "Computing dependencies for $<..."
-       @o='o'; \
-       $(CXXMKDEP) $< >$@.tmp \
-         && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
-         && rm -f $@.tmp
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
@@ -368,11 +470,11 @@ installcheck: installcheck-recursive
 all-recursive-am: config.hh
        $(MAKE) all-recursive
 
-all-am: Makefile $(LIBRARIES) config.hh
+all-am: Makefile $(LTLIBRARIES) config.hh
 
-install-exec-am: install-libLIBRARIES
+install-exec-am: install-libLTLIBRARIES
 
-uninstall-am: uninstall-libLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
 
 install-exec: install-exec-recursive install-exec-am
        @$(NORMAL_INSTALL)
@@ -394,33 +496,34 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
-               mostlyclean-compile mostlyclean-tags mostlyclean-depend \
-               mostlyclean-generic
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
+               mostlyclean-compile mostlyclean-libtool \
+               mostlyclean-tags mostlyclean-generic
 
-clean-am:  clean-hdr clean-libLIBRARIES clean-compile clean-tags \
-               clean-depend clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
+               clean-tags clean-generic mostlyclean-am
 
-distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
-               distclean-tags distclean-depend distclean-generic \
+distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
+               distclean-libtool distclean-tags distclean-generic \
                clean-am
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
-               maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-depend maintainer-clean-generic \
+maintainer-clean-am:  maintainer-clean-hdr \
+               maintainer-clean-libLTLIBRARIES \
+               maintainer-clean-compile maintainer-clean-libtool \
+               maintainer-clean-tags maintainer-clean-generic \
                distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
@@ -428,31 +531,35 @@ mostlyclean:  mostlyclean-recursive mostlyclean-am
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
-       rm -f config.status
+       -rm -f config.status
 
 .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
-maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \
-clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
-install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
+maintainer-clean-hdr mostlyclean-libLTLIBRARIES \
+distclean-libLTLIBRARIES clean-libLTLIBRARIES \
+maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \
+install-libLTLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-libtool \
+distclean-libtool clean-libtool maintainer-clean-libtool \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
-install-exec-am uninstall-am install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
+installcheck all-recursive-am all-am install-exec-am uninstall-am \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
 
 # 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.in b/flower/include/Makefile.in
index c6b3898e8025570884f881aaa6bd37470893cdd9..b52fb14ab96803a5526e25fe2b580d8fb534563d 100644 (file)
--- a/flower/include/Makefile.in
+++ b/flower/include/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./flower/include/Makefile.am.wild by bin/autowild
-# Do not edit
-# flower/lib/include/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# flower/lib/include/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,20 +51,30 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AGE = @AGE@
 CC = @CC@
+CURRENT = @CURRENT@
 CXX = @CXX@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
 LIB_SUFFIX = @LIB_SUFFIX@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MODULE_CXXFLAGS = @MODULE_CXXFLAGS@
 MODULE_LDFLAGS = @MODULE_LDFLAGS@
+NM = @NM@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 VERSION = @VERSION@
 
 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
@@ -82,30 +96,35 @@ default: all
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -114,10 +133,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = include
 
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
@@ -148,25 +163,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-tags mostlyclean-generic
 
 clean:  clean-tags clean-generic mostlyclean
 
 distclean:  distclean-tags distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
                distclean
@@ -180,6 +196,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/flower/test/Makefile.in b/flower/test/Makefile.in
index 006babd155c85cb49db3ecabbd7102006b781e0c..55bbf89aceb00dc1f59637415e464f05bfe8a2ed 100644 (file)
--- a/flower/test/Makefile.in
+++ b/flower/test/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./flower/test/Makefile.am.wild by bin/autowild
-# Do not edit
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1#
 # project  LilyPond -- the musical typesetter
 # title           makefile for flowertest
 # file    flower/test/Makefile.am.wild
@@ -62,20 +66,30 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AGE = @AGE@
 CC = @CC@
+CURRENT = @CURRENT@
 CXX = @CXX@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
 LIB_SUFFIX = @LIB_SUFFIX@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MODULE_CXXFLAGS = @MODULE_CXXFLAGS@
 MODULE_LDFLAGS = @MODULE_LDFLAGS@
+NM = @NM@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 VERSION = @VERSION@
 
 EXTRA_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
@@ -101,30 +115,35 @@ default: all
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -133,10 +152,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = test
 
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu test/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
@@ -167,25 +182,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-tags mostlyclean-generic
 
 clean:  clean-tags clean-generic mostlyclean
 
 distclean:  distclean-tags distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
                distclean
@@ -199,6 +215,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/init/Makefile.in b/init/Makefile.in
index f99b9680299593278f1ebc8dbe919879e44ed69d..65368541a2a638e8bfc8e465dad6d5171773d244 100644 (file)
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./init/Makefile.am.wild by bin/autowild
-# Do not edit
-# init/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# init/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -85,10 +95,10 @@ VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
 
-INIFILES = dutch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly
+INIFILES = dutch.ly dynamic.ly engraver.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly
 EXTRA_DIST = Makefile.am.wild $(INIFILES)
 
-CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly
+CLEANFILES = 
 
 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))
@@ -150,25 +160,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -190,6 +201,8 @@ install-data:
 uninstall-data:
        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 < $< > $@
 
 # 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.in b/input/Makefile.in
index e0786fd3c155d3fee97e46341ae7c71a6b73cb2a..588a8d7dc4ce665f98f36f59cfc46c0b28dea054 100644 (file)
--- a/input/Makefile.in
+++ b/input/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./input/Makefile.am.wild by bin/autowild
-# Do not edit
-# input/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# input/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -149,25 +159,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -181,6 +192,9 @@ mostlyclean distclean maintainer-clean
 
 default: all $(OUTFILES)
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 07200c8b059ebf24eb4e54b31bee58ee64a7ec3d..9c1e1f6ced717824d9705d95615d5d0e4e5d04e1 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,11 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./lib/Makefile.am.wild by bin/autowild
-# Do not edit
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for micro-lily-lib
 # file    lib/Makefile 
@@ -54,12 +59,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -74,11 +81,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -94,44 +105,44 @@ ZIP = @ZIP@
 
 SUBDIRS = include
 
-lib_LIBRARIES = liblily.a
-# lib_LIBRARIES = liblily.la
-
-EXTRA_DIST = Makefile.am.wild config.hh.in
+lib_LTLIBRARIES = liblily.la
 
-liblily_a_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc
+liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc
 
 INCLUDES = -Iinclude -I../flower/include
+
+EXTRA_DIST = Makefile.am.wild config.hh.in
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.hh
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(lib_LIBRARIES)
+LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-liblily_a_LIBADD = 
-liblily_a_OBJECTS =  binary-source-file.o duration-convert.o duration.o \
-includable-lexer.o input.o mapped-file-storage.o moment.o plet.o \
-simple-file-storage.o source-file.o source.o template.o warn.o \
-windhoos-suck-suck-suck-thank-you-cygnus.o
-AR = ar
+liblily_la_LDFLAGS = 
+liblily_la_LIBADD = 
+liblily_la_OBJECTS =  binary-source-file.lo duration-convert.lo \
+duration.lo includable-lexer.lo input.lo mapped-file-storage.lo \
+moment.lo plet.lo simple-file-storage.lo source-file.lo source.lo \
+template.lo warn.lo windhoos-suck-suck-suck-thank-you-cygnus.lo
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in config.hh.in stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-SOURCES = $(liblily_a_SOURCES)
-OBJECTS = $(liblily_a_OBJECTS)
+SOURCES = $(liblily_la_SOURCES)
+OBJECTS = $(liblily_la_OBJECTS)
 
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .o
+.SUFFIXES: .S .c .cc .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
 
@@ -141,6 +152,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 
 
 config.hh: stamp-h
+       @:
 stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES= CONFIG_HEADERS=lib/config.hh:lib/config.hh.in \
@@ -156,61 +168,79 @@ mostlyclean-hdr:
 clean-hdr:
 
 distclean-hdr:
-       rm -f config.hh
+       -rm -f config.hh
 
 maintainer-clean-hdr:
 
-mostlyclean-libLIBRARIES:
+mostlyclean-libLTLIBRARIES:
 
-clean-libLIBRARIES:
-       test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 
-distclean-libLIBRARIES:
+distclean-libLTLIBRARIES:
 
-maintainer-clean-libLIBRARIES:
+maintainer-clean-libLTLIBRARIES:
 
-install-libLIBRARIES: $(lib_LIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(libdir)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \
-           $(INSTALL_DATA) $$p $(libdir)/$$p; \
-         else :; fi; \
-       done
-       @$(POST_INSTALL)
-       @list='$(lib_LIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(RANLIB) $(libdir)/$$p"; \
-           $(RANLIB) $(libdir)/$$p; \
+           echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \
+           $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \
          else :; fi; \
        done
 
-uninstall-libLIBRARIES:
-       $(NORMAL_UNINSTALL)
-       list='$(lib_LIBRARIES)'; for p in $$list; do \
-         rm -f $(libdir)/$$p; \
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
        done
 
 .c.o:
        $(COMPILE) -c $<
 
+.s.o:
+       $(COMPILE) -c $<
+
+.S.o:
+       $(COMPILE) -c $<
+
 mostlyclean-compile:
-       rm -f *.o core
+       -rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-       rm -f *.tab.c
+       -rm -f *.tab.c
 
 maintainer-clean-compile:
 
-liblily.a: $(liblily_a_OBJECTS) $(liblily_a_DEPENDENCIES)
-       rm -f liblily.a
-       $(AR) cru liblily.a $(liblily_a_OBJECTS) $(liblily_a_LIBADD)
-       $(RANLIB) liblily.a
+.c.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+liblily.la: $(liblily_la_OBJECTS) $(liblily_la_DEPENDENCIES)
+       $(CXXLINK) -rpath $(libdir) $(liblily_la_LDFLAGS) $(liblily_la_OBJECTS) $(liblily_la_LIBADD) $(LIBS)
 .cc.o:
        $(CXXCOMPILE) -c $<
+.cc.lo:
+       $(LTCXXCOMPILE) -c $<
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -225,7 +255,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
@@ -235,7 +265,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+       done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
@@ -249,24 +281,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -281,15 +318,15 @@ distdir: $(DISTFILES)
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-binary-source-file.o binary-source-file.lo: binary-source-file.cc \
+binary-source-file.lo binary-source-file.o: binary-source-file.cc \
        include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/plist.hh \
        ../flower/include/list.hh ../flower/include/list.icc \
@@ -303,7 +340,7 @@ binary-source-file.o binary-source-file.lo: binary-source-file.cc \
        ../flower/include/international.hh include/source-file.hh \
        include/binary-source-file.hh \
        ../flower/include/string-convert.hh
-duration-convert.o duration-convert.lo: duration-convert.cc \
+duration-convert.lo duration-convert.o: duration-convert.cc \
        include/duration-convert.hh include/duration.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        include/moment.hh ../flower/include/rational.hh \
@@ -312,7 +349,7 @@ duration-convert.o duration-convert.lo: duration-convert.cc \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/varray.hh \
        include/warn.hh
-duration.o duration.lo: duration.cc include/proto.hh \
+duration.lo duration.o: duration.cc include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -327,7 +364,7 @@ duration.o duration.lo: duration.cc include/proto.hh \
        ../flower/include/rational.hh include/duration.hh \
        include/plet.hh include/duration-convert.hh \
        ../flower/include/varray.hh
-includable-lexer.o includable-lexer.lo: includable-lexer.cc \
+includable-lexer.lo includable-lexer.o: includable-lexer.cc \
        include/includable-lexer.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -340,7 +377,7 @@ includable-lexer.o includable-lexer.lo: includable-lexer.cc \
        ../flower/include/link.hh ../flower/include/link.icc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc
-input.o input.lo: input.cc include/proto.hh ../flower/include/fproto.hh \
+input.lo input.o: input.cc include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh include/input.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -352,18 +389,18 @@ input.o input.lo: input.cc include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc include/source-file.hh
-mapped-file-storage.o mapped-file-storage.lo: mapped-file-storage.cc
-moment.o moment.lo: moment.cc ../flower/include/string.hh \
+mapped-file-storage.lo mapped-file-storage.o: mapped-file-storage.cc
+moment.lo moment.o: moment.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
        include/moment.hh ../flower/include/rational.hh
-plet.o plet.lo: plet.cc include/plet.hh include/moment.hh \
+plet.lo plet.o: plet.cc include/plet.hh include/moment.hh \
        ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh
-simple-file-storage.o simple-file-storage.lo: simple-file-storage.cc \
+simple-file-storage.lo simple-file-storage.o: simple-file-storage.cc \
        include/simple-file-storage.hh include/file-storage.hh \
        include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/varray.hh \
@@ -372,7 +409,7 @@ simple-file-storage.o simple-file-storage.lo: simple-file-storage.cc \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
        include/warn.hh
-source-file.o source-file.lo: source-file.cc ../flower/include/string.hh \
+source-file.lo source-file.o: source-file.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -386,7 +423,7 @@ source-file.o source-file.lo: source-file.cc ../flower/include/string.hh \
        include/windhoos-suck-suck-suck-thank-you-cygnus.hh \
        include/source-file.hh include/simple-file-storage.hh \
        include/file-storage.hh
-source.o source.lo: source.cc include/binary-source-file.hh \
+source.lo source.o: source.cc include/binary-source-file.hh \
        include/source-file.hh include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string.hh \
@@ -400,7 +437,7 @@ source.o source.lo: source.cc include/binary-source-file.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/source.hh ../flower/include/path.hh \
        ../flower/include/varray.hh
-template.o template.lo: template.cc include/source-file.hh \
+template.lo template.o: template.cc include/source-file.hh \
        include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -413,12 +450,12 @@ template.o template.lo: template.cc include/source-file.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc ../flower/include/pcursor.tcc \
        ../flower/include/cursor.tcc ../flower/include/list.tcc
-warn.o warn.lo: warn.cc include/warn.hh ../flower/include/string.hh \
+warn.lo warn.o: warn.cc include/warn.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh
-windhoos-suck-suck-suck-thank-you-cygnus.o windhoos-suck-suck-suck-thank-you-cygnus.lo: \
+windhoos-suck-suck-suck-thank-you-cygnus.lo windhoos-suck-suck-suck-thank-you-cygnus.o: \
        windhoos-suck-suck-suck-thank-you-cygnus.cc
 
 info: info-recursive
@@ -429,11 +466,11 @@ installcheck: installcheck-recursive
 all-recursive-am: config.hh
        $(MAKE) all-recursive
 
-all-am: Makefile $(LIBRARIES) config.hh
+all-am: Makefile $(LTLIBRARIES) config.hh
 
-install-exec-am: install-libLIBRARIES
+install-exec-am: install-libLTLIBRARIES
 
-uninstall-am: uninstall-libLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
 
 install-exec: install-exec-recursive install-exec-am
        @$(NORMAL_INSTALL)
@@ -455,50 +492,56 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
-               mostlyclean-compile mostlyclean-tags \
-               mostlyclean-generic
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
+               mostlyclean-compile mostlyclean-libtool \
+               mostlyclean-tags mostlyclean-generic
 
-clean-am:  clean-hdr clean-libLIBRARIES clean-compile clean-tags \
-               clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
+               clean-tags clean-generic mostlyclean-am
 
-distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
-               distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
+               distclean-libtool distclean-tags distclean-generic \
+               clean-am
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
-               maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-hdr \
+               maintainer-clean-libLTLIBRARIES \
+               maintainer-clean-compile maintainer-clean-libtool \
+               maintainer-clean-tags maintainer-clean-generic \
+               distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
 
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
 .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
-maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \
-clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
-install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
+maintainer-clean-hdr mostlyclean-libLTLIBRARIES \
+distclean-libLTLIBRARIES clean-libLTLIBRARIES \
+maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \
+install-libLTLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-libtool \
+distclean-libtool clean-libtool maintainer-clean-libtool \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
@@ -509,9 +552,11 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
 MODULE_CXXFLAGS += -D_REENTRANT
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in
index c933326bc12492db682fbffb18df38c2e8c4126e..f6294abc3192f80df929154a34926af190548257 100644 (file)
--- a/lib/include/Makefile.in
+++ b/lib/include/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./lib/include/Makefile.am.wild by bin/autowild
-# Do not edit
-# lib/include/Makefile
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# lib/include/Makefile
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -112,21 +122,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -165,25 +180,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-tags mostlyclean-generic
 
 clean:  clean-tags clean-generic mostlyclean
 
 distclean:  distclean-tags distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
                distclean
@@ -197,6 +213,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/lily/Makefile.in b/lily/Makefile.in
index 9bec8d02f82660c16fe05ca85f07d79652fb428e..adc2cd82295dadf2be3c95f11b5ec40191060026 100644 (file)
--- a/lily/Makefile.in
+++ b/lily/Makefile.in
@@ -1,11 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./lily/Makefile.am.wild by bin/autowild
-# Do not edit
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter # title     makefile for lilypond
 # file    lily/Makefile.am.wild
 #
@@ -53,12 +58,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -73,11 +80,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -95,14 +106,17 @@ SUBDIRS = include
 
 bin_PROGRAMS = lilypond
 
-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 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
+# 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
 noinst_HEADERS = parser.hh
 
 lilypond_LDADD = -llily -lflower @LEXLIB@
 
-lilypond_LDFLAGS = -L../lib -L../flower
+lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
 
-INCLUDES = -I. -Iinclude -I../lib/include -I../flower/include 
+INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
 
 EXTRA_DIST = Makefile.am.wild Stable.make VERSION
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -130,15 +144,15 @@ 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 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 \
+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 \
@@ -162,7 +176,12 @@ lilypond_DEPENDENCIES =
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LEXLIB = @LEXLIB@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in lexer.cc parser.cc
@@ -177,7 +196,7 @@ OBJECTS = $(lilypond_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .h .ll .o .yy
+.SUFFIXES: .S .c .cc .ll .lo .o .s .yy
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lily/Makefile
 
@@ -189,7 +208,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-       test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -200,13 +219,13 @@ install-binPROGRAMS: $(bin_PROGRAMS)
        $(mkinstalldirs) $(bindir)
        @list='$(bin_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo "  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
-            $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
          else :; fi; \
        done
 
 uninstall-binPROGRAMS:
-       $(NORMAL_UNINSTALL)
+       @$(NORMAL_UNINSTALL)
        list='$(bin_PROGRAMS)'; for p in $$list; do \
          rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
        done
@@ -214,33 +233,57 @@ uninstall-binPROGRAMS:
 .c.o:
        $(COMPILE) -c $<
 
+.s.o:
+       $(COMPILE) -c $<
+
+.S.o:
+       $(COMPILE) -c $<
+
 mostlyclean-compile:
-       rm -f *.o core
+       -rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-       rm -f *.tab.c
+       -rm -f *.tab.c
 
 maintainer-clean-compile:
 
+.c.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
 lilypond: $(lilypond_OBJECTS) $(lilypond_DEPENDENCIES)
        @rm -f lilypond
        $(CXXLINK) $(lilypond_LDFLAGS) $(lilypond_OBJECTS) $(lilypond_LDADD) $(LIBS)
 .yy.cc:
-       $(YACC) $(YFLAGS) $< && mv y.tab.c $@
-       if test -f y.tab.h; then \
-       if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-       else :; fi
-.yy.h:
-       $(YACC) $(YFLAGS) $< && mv y.tab.c $@
+       $(YACC) $(YFLAGS) $< && mv y.tab.c $*.cc
        if test -f y.tab.h; then \
        if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
        else :; fi
+parser.hh: parser.cc
+
 .ll.cc:
        $(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
 .cc.o:
        $(CXXCOMPILE) -c $<
+.cc.lo:
+       $(LTCXXCOMPILE) -c $<
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -255,7 +298,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
@@ -265,7 +308,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+       done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
@@ -279,24 +324,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -311,19 +361,18 @@ distdir: $(DISTFILES)
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-abbrev.o abbrev.lo: abbrev.cc include/abbrev.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 \
+abbrev.o: abbrev.cc include/abbrev.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 \
@@ -346,8 +395,7 @@ abbrev.o abbrev.lo: abbrev.cc include/abbrev.hh include/item.hh \
        ../flower/include/assoc.hh include/lookup.hh include/atom.hh \
        ../flower/include/scalar.hh include/stem.hh include/molecule.hh \
        include/dimen.hh
-abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \
-       abbreviation-beam-engraver.cc \
+abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \
        ../lib/include/duration-convert.hh ../lib/include/duration.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
@@ -377,10 +425,10 @@ abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \
        include/abbreviation-beam.hh include/beam.hh \
        include/directional-spanner.hh include/spanner.hh \
        include/musical-request.hh include/misc.hh include/grouping.hh
-abbreviation-beam.o abbreviation-beam.lo: abbreviation-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 \
+abbreviation-beam.o: abbreviation-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 \
        ../flower/include/virtual-methods.hh \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh \
@@ -410,7 +458,7 @@ abbreviation-beam.o abbreviation-beam.lo: abbreviation-beam.cc \
        include/music-output-def.hh ../flower/include/dictionary.hh \
        ../flower/include/assoc.hh include/lookup.hh \
        include/stem-info.hh
-atom.o atom.lo: atom.cc include/atom.hh ../flower/include/string.hh \
+atom.o: atom.cc include/atom.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -421,7 +469,7 @@ atom.o atom.lo: atom.cc include/atom.hh ../flower/include/string.hh \
        ../flower/include/scalar.hh include/dimen.hh \
        ../flower/include/varray.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-audio-column.o audio-column.lo: audio-column.cc include/audio-column.hh \
+audio-column.o: audio-column.cc include/audio-column.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/plist.hh \
        ../flower/include/list.hh ../flower/include/list.icc \
@@ -437,17 +485,16 @@ audio-column.o audio-column.lo: audio-column.cc include/audio-column.hh \
        ../flower/include/virtual-methods.hh include/performance.hh \
        include/music-output.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-audio-element.o audio-element.lo: audio-element.cc \
-       include/audio-element.hh ../flower/include/virtual-methods.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../flower/include/string.hh \
+audio-element.o: audio-element.cc include/audio-element.hh \
+       ../flower/include/virtual-methods.hh include/debug.hh \
+       ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../lib/include/warn.hh
-audio-item.o audio-item.lo: audio-item.cc include/debug.hh \
+audio-item.o: audio-item.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -466,7 +513,7 @@ audio-item.o audio-item.lo: audio-item.cc include/debug.hh \
        ../lib/include/input.hh include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/direction.hh \
        include/audio-column.hh
-audio-staff.o audio-staff.lo: audio-staff.cc include/audio-staff.hh \
+audio-staff.o: audio-staff.cc include/audio-staff.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/plist.hh \
        ../flower/include/list.hh ../flower/include/list.icc \
@@ -483,10 +530,9 @@ audio-staff.o audio-staff.lo: audio-staff.cc include/audio-staff.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
        include/midi-stream.hh include/midi-walker.hh \
        ../flower/include/pqueue.hh ../flower/include/varray.hh
-axis-group-administration.o axis-group-administration.lo: \
-       axis-group-administration.cc ../flower/include/interval.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/compare.hh \
+axis-group-administration.o: axis-group-administration.cc \
+       ../flower/include/interval.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../flower/include/compare.hh \
        include/axis-group-administration.hh \
        ../flower/include/parray.hh ../flower/include/varray.hh \
        include/axes.hh ../flower/include/string.hh \
@@ -498,7 +544,7 @@ axis-group-administration.o axis-group-administration.lo: \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-axis-group-element.o axis-group-element.lo: axis-group-element.cc \
+axis-group-element.o: axis-group-element.cc \
        include/axis-group-element.hh include/score-elem.hh \
        ../flower/include/parray.hh ../flower/include/varray.hh \
        ../flower/include/virtual-methods.hh \
@@ -512,10 +558,9 @@ axis-group-element.o axis-group-element.lo: axis-group-element.cc \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/interval.hh \
        include/axis-group-administration.hh
-axis-group-item.o axis-group-item.lo: axis-group-item.cc \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
+axis-group-item.o: axis-group-item.cc include/axis-group-item.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 \
@@ -535,7 +580,7 @@ axis-group-item.o axis-group-item.lo: axis-group-item.cc \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc
-axis-group-spanner.o axis-group-spanner.lo: axis-group-spanner.cc \
+axis-group-spanner.o: axis-group-spanner.cc \
        include/axis-group-spanner.hh include/spanner.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -559,17 +604,16 @@ axis-group-spanner.o axis-group-spanner.lo: axis-group-spanner.cc \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc
-axis.o axis.lo: axis.cc include/axes.hh ../flower/include/string.hh \
+axis.o: axis.cc include/axes.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh
-bar-column-grav.o bar-column-grav.lo: bar-column-grav.cc \
-       include/bar-column-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 \
+bar-column-grav.o: bar-column-grav.cc include/bar-column-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 \
@@ -589,7 +633,7 @@ bar-column-grav.o bar-column-grav.lo: bar-column-grav.cc \
        include/axis-group-administration.hh include/item.hh \
        include/boxes.hh include/drul-array.hh include/elem-group.hh \
        include/script.hh include/staff-side.hh include/bar.hh
-bar-column.o bar-column.lo: bar-column.cc include/bar.hh include/item.hh \
+bar-column.o: bar-column.cc include/bar.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 \
@@ -607,11 +651,11 @@ bar-column.o bar-column.lo: bar-column.cc include/bar.hh include/item.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
-bar-grav.o bar-grav.lo: 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 ../flower/include/varray.hh \
-       include/request.hh ../flower/include/string.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 \
+       ../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 \
@@ -634,12 +678,11 @@ bar-grav.o bar-grav.lo: bar-grav.cc include/bar-grav.hh \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc include/translator-group.hh
-bar-number-grav.o bar-number-grav.lo: bar-number-grav.cc \
-       include/bar-number-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 \
+bar-number-grav.o: bar-number-grav.cc include/bar-number-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 \
@@ -659,7 +702,7 @@ bar-number-grav.o bar-number-grav.lo: bar-number-grav.cc \
        include/command-request.hh ../lib/include/duration.hh \
        ../lib/include/plet.hh include/bar.hh \
        include/time-description.hh
-bar.o bar.lo: bar.cc include/bar.hh include/item.hh include/boxes.hh \
+bar.o: bar.cc include/bar.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 \
@@ -683,11 +726,10 @@ bar.o bar.lo: bar.cc include/bar.hh include/item.hh include/boxes.hh \
        include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-beam-grav.o beam-grav.lo: beam-grav.cc \
-       ../lib/include/duration-convert.hh ../lib/include/duration.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+beam-grav.o: beam-grav.cc ../lib/include/duration-convert.hh \
+       ../lib/include/duration.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/varray.hh \
@@ -716,7 +758,7 @@ beam-grav.o beam-grav.lo: beam-grav.cc \
        include/horizontal-group-item.hh include/elem-group.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh include/axis-group-item.hh
-beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \
+beam-swallow-trans.o: beam-swallow-trans.cc \
        include/type-swallow-trans.hh include/translator.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -733,10 +775,9 @@ beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/direction.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh
-beam.o beam.lo: 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 \
+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 \
        ../flower/include/virtual-methods.hh \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh \
@@ -766,7 +807,7 @@ beam.o beam.lo: beam.cc include/p-col.hh \
        include/music-output-def.hh ../flower/include/dictionary.hh \
        ../flower/include/assoc.hh include/lookup.hh \
        include/stem-info.hh include/main.hh
-bow.o bow.lo: bow.cc include/bow.hh include/directional-spanner.hh \
+bow.o: bow.cc include/bow.hh include/directional-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 \
@@ -789,17 +830,17 @@ bow.o bow.lo: bow.cc include/bow.hh include/directional-spanner.hh \
        ../flower/include/plist.icc ../flower/include/dictionary.hh \
        ../flower/include/assoc.hh include/molecule.hh include/boxes.hh \
        include/lookup.hh include/atom.hh ../flower/include/scalar.hh
-boxes.o boxes.lo: boxes.cc include/boxes.hh ../flower/include/fproto.hh \
+boxes.o: boxes.cc 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 ../flower/include/varray.hh
-break-align-item.o break-align-item.lo: 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 \
+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 \
@@ -812,7 +853,7 @@ break-align-item.o break-align-item.lo: break-align-item.cc \
        ../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
-break.o break.lo: break.cc include/score-column.hh include/lily-proto.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 \
@@ -841,17 +882,17 @@ break.o break.lo: break.cc include/score-column.hh include/lily-proto.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.lo: change-iterator.cc \
-       include/change-iterator.hh include/music-iterator.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/varray.hh \
-       ../lib/include/moment.hh ../flower/include/rational.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 \
+       ../flower/include/real.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       ../flower/include/varray.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/virtual-methods.hh \
        include/translator-group.hh ../flower/include/string.hh \
@@ -863,19 +904,19 @@ change-iterator.o change-iterator.lo: change-iterator.cc \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-change-translator.o change-translator.lo: change-translator.cc \
-       include/change-translator.hh include/music.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/minterval.hh \
-       ../flower/include/interval.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
+change-translator.o: change-translator.cc include/change-translator.hh \
+       include/music.hh ../flower/include/virtual-methods.hh \
+       ../lib/include/input.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       include/minterval.hh ../flower/include/interval.hh \
+       ../flower/include/compare.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh include/lily-proto.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-chord-iterator.o chord-iterator.lo: chord-iterator.cc \
-       include/translator-group.hh ../flower/include/string.hh \
+chord-iterator.o: chord-iterator.cc include/translator-group.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -896,7 +937,7 @@ chord-iterator.o chord-iterator.lo: chord-iterator.cc \
        ../flower/include/rational.hh include/music-list.hh \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh
-clef-grav.o clef-grav.lo: clef-grav.cc include/bar.hh include/item.hh \
+clef-grav.o: clef-grav.cc include/bar.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 \
@@ -921,8 +962,8 @@ clef-grav.o clef-grav.lo: clef-grav.cc include/bar.hh include/item.hh \
        ../lib/include/warn.hh include/command-request.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/time-description.hh
-clef-item.o clef-item.lo: clef-item.cc include/clef-item.hh \
-       include/item.hh include/boxes.hh ../flower/include/fproto.hh \
+clef-item.o: clef-item.cc include/clef-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 \
@@ -948,7 +989,7 @@ clef-item.o clef-item.lo: clef-item.cc include/clef-item.hh \
        ../lib/include/input.hh include/music.hh include/minterval.hh \
        include/score-elem-info.hh include/staff-info.hh \
        include/translator.hh
-col-info.o col-info.lo: col-info.cc include/p-col.hh \
+col-info.o: col-info.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 \
@@ -972,21 +1013,21 @@ col-info.o col-info.lo: col-info.cc include/p-col.hh \
        ../flower/include/plist.icc include/col-info.hh \
        ../flower/include/pointer.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-colhpos.o colhpos.lo: 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 include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.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 \
+       include/debug.hh ../flower/include/dstream.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/warn.hh ../flower/include/vector.hh \
        include/line-spacer.hh ../flower/include/interval.hh
-collision-grav.o collision-grav.lo: collision-grav.cc \
-       include/note-column.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 \
+collision-grav.o: collision-grav.cc include/note-column.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 \
@@ -1007,8 +1048,8 @@ collision-grav.o collision-grav.lo: collision-grav.cc \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/collision.hh
-collision.o collision.lo: collision.cc include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
+collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1036,9 +1077,8 @@ collision.o collision.lo: collision.cc include/debug.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.lo: command-request.cc \
-       include/command-request.hh include/request.hh \
-       ../flower/include/string.hh \
+command-request.o: command-request.cc include/command-request.hh \
+       include/request.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1051,17 +1091,16 @@ command-request.o command-request.lo: command-request.cc \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh include/musical-request.hh
-crescendo.o crescendo.lo: crescendo.cc include/molecule.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/boxes.hh \
-       ../flower/include/interval.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
+crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       include/boxes.hh ../flower/include/interval.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/direction.hh \
@@ -1082,7 +1121,7 @@ crescendo.o crescendo.lo: crescendo.cc include/molecule.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/item.hh
-debug.o debug.lo: debug.cc include/debug.hh ../flower/include/dstream.hh \
+debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -1092,7 +1131,7 @@ debug.o debug.lo: debug.cc include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh ../flower/include/flower-debug.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
        include/main.hh
-dimen.o dimen.lo: dimen.cc include/dimen.hh ../flower/include/real.hh \
+dimen.o: dimen.cc include/dimen.hh ../flower/include/real.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/string-handle.hh \
@@ -1100,7 +1139,7 @@ dimen.o dimen.lo: dimen.cc include/dimen.hh ../flower/include/real.hh \
        include/debug.hh ../flower/include/dstream.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../lib/include/warn.hh
-directional-spanner.o directional-spanner.lo: directional-spanner.cc \
+directional-spanner.o: directional-spanner.cc \
        include/directional-spanner.hh include/spanner.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -1115,9 +1154,9 @@ directional-spanner.o directional-spanner.lo: directional-spanner.cc \
        ../flower/include/international.hh ../flower/include/compare.hh \
        ../flower/include/interval.hh include/drul-array.hh \
        include/direction.hh
-dot-column-grav.o dot-column-grav.lo: dot-column-grav.cc
-dot-column.o dot-column.lo: dot-column.cc include/dots.hh \
-       include/item.hh include/boxes.hh ../flower/include/fproto.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 \
        ../flower/include/real.hh ../flower/include/interval.hh \
        ../flower/include/compare.hh include/offset.hh include/axes.hh \
        ../flower/include/string.hh \
@@ -1134,7 +1173,7 @@ dot-column.o dot-column.lo: dot-column.cc include/dots.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/rhythmic-head.hh
-dots.o dots.lo: dots.cc include/dots.hh include/item.hh include/boxes.hh \
+dots.o: dots.cc include/dots.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 \
@@ -1156,7 +1195,7 @@ dots.o dots.lo: dots.cc include/dots.hh include/item.hh include/boxes.hh \
        ../flower/include/rational.hh include/music-output-def.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/lookup.hh include/atom.hh ../flower/include/scalar.hh
-dynamic-grav.o dynamic-grav.lo: dynamic-grav.cc include/debug.hh \
+dynamic-grav.o: dynamic-grav.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -1193,9 +1232,8 @@ dynamic-grav.o dynamic-grav.lo: dynamic-grav.cc include/debug.hh \
        include/staff-sym.hh include/note-column.hh \
        include/script-column.hh \
        include/horizontal-vertical-group-item.hh
-elem-group.o elem-group.lo: elem-group.cc include/elem-group.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.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 \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh \
@@ -1210,18 +1248,17 @@ elem-group.o elem-group.lo: elem-group.cc include/elem-group.hh \
        include/boxes.hh include/drul-array.hh include/direction.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-engraver-group.o engraver-group.lo: engraver-group.cc \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.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/compare.hh \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/engraver-group.hh include/lily-proto.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       ../flower/include/string.hh \
+engraver-group.o: engraver-group.cc ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
+       ../flower/include/cursor.icc ../flower/include/iterate.hh \
+       ../flower/include/plist.icc include/engraver-group.hh \
+       include/lily-proto.hh ../flower/include/parray.hh \
+       ../flower/include/varray.hh include/score-elem-info.hh \
+       ../flower/include/scalar.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/engraver.hh \
@@ -1237,13 +1274,12 @@ engraver-group.o engraver-group.lo: engraver-group.cc \
        include/p-score.hh include/colhpos.hh include/music-output.hh \
        include/score-elem.hh ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh include/axes.hh
-engraver.o engraver.lo: engraver.cc include/music-list.hh \
-       include/music.hh ../flower/include/virtual-methods.hh \
-       ../lib/include/input.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
+engraver.o: engraver.cc include/music-list.hh include/music.hh \
+       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh include/minterval.hh \
+       ../flower/include/interval.hh ../flower/include/compare.hh \
+       ../lib/include/moment.hh ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh include/lily-proto.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/plist.hh \
@@ -1261,7 +1297,7 @@ engraver.o engraver.lo: engraver.cc include/music-list.hh \
        ../flower/include/parray.hh include/engraver-group.hh \
        include/translator-group.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-general-script-def.o general-script-def.lo: general-script-def.cc \
+general-script-def.o: general-script-def.cc \
        include/general-script-def.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../lib/include/input.hh \
@@ -1273,9 +1309,8 @@ general-script-def.o general-script-def.lo: general-script-def.cc \
        ../flower/include/international.hh ../flower/include/compare.hh \
        ../lib/include/warn.hh include/atom.hh include/boxes.hh \
        ../flower/include/interval.hh include/offset.hh include/axes.hh
-global-translator.o global-translator.lo: global-translator.cc \
-       include/global-translator.hh include/translator-group.hh \
-       ../flower/include/string.hh \
+global-translator.o: global-translator.cc include/global-translator.hh \
+       include/translator-group.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1291,21 +1326,20 @@ global-translator.o global-translator.lo: global-translator.cc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        ../flower/include/rational.hh ../flower/include/pqueue.hh
-gourlay-breaking.o gourlay-breaking.lo: gourlay-breaking.cc \
-       include/gourlay-breaking.hh include/break.hh \
-       ../flower/include/varray.hh ../flower/include/interval.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/compare.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/colhpos.hh \
-       include/spring-spacer.hh include/line-spacer.hh \
-       ../flower/include/vector.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/col-info.hh \
-       ../flower/include/pointer.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
+gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.hh \
+       include/break.hh ../flower/include/varray.hh \
+       ../flower/include/interval.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../flower/include/compare.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       include/colhpos.hh include/spring-spacer.hh \
+       include/line-spacer.hh ../flower/include/vector.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/col-info.hh ../flower/include/pointer.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 \
@@ -1322,9 +1356,8 @@ gourlay-breaking.o gourlay-breaking.lo: gourlay-breaking.cc \
        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
-graphical-element.o graphical-element.lo: graphical-element.cc \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.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 \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/string-handle.hh \
@@ -1337,8 +1370,8 @@ graphical-element.o graphical-element.lo: graphical-element.cc \
        ../flower/include/directed-graph.hh \
        include/axis-group-administration.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-grouping.o grouping.lo: grouping.cc include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
+grouping.o: grouping.cc include/debug.hh ../flower/include/dstream.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1347,11 +1380,11 @@ grouping.o grouping.lo: grouping.cc include/debug.hh \
        ../lib/include/warn.hh include/grouping.hh include/minterval.hh \
        ../flower/include/interval.hh ../lib/include/moment.hh \
        ../flower/include/rational.hh ../flower/include/varray.hh
-head-grav.o head-grav.lo: head-grav.cc include/note-head.hh \
-       include/rhythmic-head.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 \
+head-grav.o: head-grav.cc include/note-head.hh include/rhythmic-head.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 \
@@ -1375,7 +1408,7 @@ head-grav.o head-grav.lo: head-grav.cc include/note-head.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/musical-request.hh ../lib/include/duration.hh \
        ../lib/include/plet.hh include/dots.hh
-header.o header.lo: header.cc ../flower/include/string.hh \
+header.o: header.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1384,10 +1417,10 @@ header.o header.lo: header.cc ../flower/include/string.hh \
        ../flower/include/assoc-iter.hh ../flower/include/assoc.hh \
        ../flower/include/varray.hh ../flower/include/dictionary.hh \
        include/header.hh
-horizontal-align-item.o horizontal-align-item.lo: \
-       horizontal-align-item.cc include/horizontal-align-item.hh \
-       include/elem-group.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
+horizontal-align-item.o: horizontal-align-item.cc \
+       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 \
@@ -1402,8 +1435,7 @@ horizontal-align-item.o horizontal-align-item.lo: \
        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.lo: \
-       horizontal-group-item.cc include/p-col.hh \
+horizontal-group-item.o: horizontal-group-item.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 \
@@ -1425,8 +1457,7 @@ horizontal-group-item.o horizontal-group-item.lo: \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc
-horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \
-       horizontal-vertical-group-item.cc \
+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 \
        include/score-elem.hh ../flower/include/parray.hh \
@@ -1450,7 +1481,7 @@ horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc
-idealspacing.o idealspacing.lo: idealspacing.cc include/idealspacing.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 \
@@ -1474,10 +1505,9 @@ idealspacing.o idealspacing.lo: idealspacing.cc include/idealspacing.hh \
        ../flower/include/plist.icc 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.lo: identifier.cc include/midi-def.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/string.hh \
+identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
@@ -1502,7 +1532,7 @@ identifier.o identifier.lo: identifier.cc include/midi-def.hh \
        include/direction.hh include/script-def.hh \
        include/general-script-def.hh include/request.hh \
        include/music.hh include/minterval.hh include/translator.hh
-ineq-constrained-qp.o ineq-constrained-qp.lo: ineq-constrained-qp.cc \
+ineq-constrained-qp.o: ineq-constrained-qp.cc \
        include/ineq-constrained-qp.hh ../flower/include/matrix.hh \
        ../flower/include/matrix-storage.hh ../flower/include/varray.hh \
        ../flower/include/real.hh ../flower/include/virtual-methods.hh \
@@ -1514,7 +1544,7 @@ ineq-constrained-qp.o ineq-constrained-qp.lo: ineq-constrained-qp.cc \
        ../flower/include/international.hh ../flower/include/compare.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../lib/include/warn.hh ../flower/include/choleski.hh
-item.o item.lo: item.cc include/p-score.hh include/colhpos.hh \
+item.o: item.cc include/p-score.hh include/colhpos.hh \
        ../flower/include/varray.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/parray.hh \
@@ -1539,11 +1569,11 @@ item.o item.lo: item.cc include/p-score.hh include/colhpos.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/spanner.hh
-key-grav.o key-grav.lo: 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 ../flower/include/varray.hh \
-       include/request.hh ../flower/include/string.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 \
+       ../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 \
@@ -1563,7 +1593,7 @@ key-grav.o key-grav.lo: key-grav.cc include/key-grav.hh \
        ../lib/include/plet.hh include/local-key-grav.hh \
        include/musical-request.hh include/local-key-item.hh \
        include/bar.hh include/time-description.hh
-key-item.o key-item.lo: key-item.cc include/key-item.hh include/item.hh \
+key-item.o: key-item.cc include/key-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 \
@@ -1592,12 +1622,11 @@ key-item.o key-item.lo: key-item.cc include/key-item.hh include/item.hh \
        include/music.hh include/minterval.hh \
        include/score-elem-info.hh include/staff-info.hh \
        include/translator.hh
-key-performer.o key-performer.lo: key-performer.cc \
-       include/key-performer.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/performer.hh \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
+key-performer.o: key-performer.cc include/key-performer.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       include/performer.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 \
@@ -1611,21 +1640,21 @@ key-performer.o key-performer.lo: key-performer.cc \
        ../flower/include/parray.hh include/command-request.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/audio-item.hh include/audio-element.hh
-key.o key.lo: key.cc include/key.hh ../flower/include/varray.hh \
+key.o: key.cc include/key.hh ../flower/include/varray.hh \
        ../flower/include/scalar.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh
-keyword.o keyword.lo: keyword.cc include/keyword.hh
-leastsquares.o leastsquares.lo: leastsquares.cc include/leastsquares.hh \
+keyword.o: keyword.cc include/keyword.hh
+leastsquares.o: leastsquares.cc include/leastsquares.hh \
        ../flower/include/varray.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
-lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \
+lexer.o: lexer.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1639,7 +1668,7 @@ lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        include/parseconstruct.hh include/main.hh include/identifier.hh \
        ../lib/include/input.hh ../flower/include/virtual-methods.hh
-lexerinit.o lexerinit.lo: lexerinit.cc ../lib/include/proto.hh \
+lexerinit.o: lexerinit.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -1658,9 +1687,9 @@ lexerinit.o lexerinit.lo: lexerinit.cc ../lib/include/proto.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        include/main.hh ../lib/include/source-file.hh \
        ../lib/include/source.hh
-lily-version.o lily-version.lo: lily-version.cc ../lib/config.hh
-line-group-grav.o line-group-grav.lo: line-group-grav.cc \
-       include/staff-sym.hh include/spanner.hh include/lily-proto.hh \
+lily-version.o: lily-version.cc ../lib/config.hh
+line-group-grav.o: line-group-grav.cc include/staff-sym.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 \
@@ -1692,16 +1721,16 @@ line-group-grav.o line-group-grav.lo: line-group-grav.cc \
        ../flower/include/link.hh ../flower/include/link.icc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc
-line-spacer.o line-spacer.lo: line-spacer.cc include/line-spacer.hh \
+line-spacer.o: line-spacer.cc include/line-spacer.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/varray.hh ../flower/include/vector.hh \
        ../flower/include/interval.hh ../flower/include/compare.hh
-local-key-grav.o local-key-grav.lo: local-key-grav.cc \
-       include/musical-request.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/request.hh \
-       ../flower/include/string.hh \
+linear-programming.o: linear-programming.cc
+local-key-grav.o: local-key-grav.cc include/musical-request.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.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 \
@@ -1726,7 +1755,7 @@ local-key-grav.o local-key-grav.lo: local-key-grav.cc \
        include/directional-spanner.hh include/spanner.hh \
        include/note-head.hh include/rhythmic-head.hh \
        include/time-description.hh
-local-key-item.o local-key-item.lo: local-key-item.cc include/dimen.hh \
+local-key-item.o: local-key-item.cc include/dimen.hh \
        ../flower/include/real.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/string-handle.hh \
@@ -1754,7 +1783,7 @@ local-key-item.o local-key-item.lo: local-key-item.cc include/dimen.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/note-head.hh include/rhythmic-head.hh include/misc.hh \
        include/grouping.hh
-lookup.o lookup.lo: lookup.cc include/lookup.hh include/atom.hh \
+lookup.o: lookup.cc include/lookup.hh include/atom.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -1776,7 +1805,7 @@ lookup.o lookup.lo: lookup.cc include/lookup.hh include/atom.hh \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc include/main.hh
-lyric-grav.o lyric-grav.lo: lyric-grav.cc include/lyric-engraver.hh \
+lyric-grav.o: lyric-grav.cc include/lyric-engraver.hh \
        include/engraver.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/varray.hh \
@@ -1805,12 +1834,11 @@ lyric-grav.o lyric-grav.lo: lyric-grav.cc include/lyric-engraver.hh \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc include/lookup.hh include/atom.hh
-lyric-performer.o lyric-performer.lo: lyric-performer.cc \
-       include/lyric-performer.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/performer.hh \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
+lyric-performer.o: lyric-performer.cc include/lyric-performer.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       include/performer.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 \
@@ -1825,15 +1853,15 @@ lyric-performer.o lyric-performer.lo: lyric-performer.cc \
        include/general-script-def.hh include/musical-request.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/audio-item.hh include/audio-element.hh
-main.o main.lo: main.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/lgetopt.hh \
-       include/misc.hh include/lily-proto.hh ../lib/include/moment.hh \
+main.o: main.cc ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       ../flower/include/lgetopt.hh include/misc.hh \
+       include/lily-proto.hh ../lib/include/moment.hh \
        ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/scalar.hh ../flower/include/string.hh \
@@ -1846,11 +1874,11 @@ main.o main.lo: main.cc ../lib/include/proto.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        include/my-lily-parser.hh ../lib/include/duration.hh \
        ../lib/include/plet.hh ../lib/include/input.hh
-meter-grav.o meter-grav.lo: meter-grav.cc include/meter-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 \
+meter-grav.o: meter-grav.cc include/meter-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 \
@@ -1875,12 +1903,11 @@ meter-grav.o meter-grav.lo: meter-grav.cc include/meter-grav.hh \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/translator-group.hh
-meter-performer.o meter-performer.lo: meter-performer.cc \
-       include/meter-performer.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/performer.hh \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
+meter-performer.o: meter-performer.cc include/meter-performer.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       include/performer.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 \
@@ -1894,7 +1921,7 @@ meter-performer.o meter-performer.lo: meter-performer.cc \
        ../flower/include/parray.hh include/command-request.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/audio-item.hh include/audio-element.hh
-meter.o meter.lo: meter.cc ../flower/include/scalar.hh \
+meter.o: meter.cc ../flower/include/scalar.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -1918,11 +1945,10 @@ meter.o meter.lo: meter.cc ../flower/include/scalar.hh \
        ../flower/include/rational.hh include/music-output-def.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/lookup.hh include/atom.hh
-midi-def.o midi-def.lo: midi-def.cc include/misc.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+midi-def.o: midi-def.cc include/misc.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/scalar.hh ../flower/include/string.hh \
        ../flower/include/string-handle.hh \
@@ -1946,7 +1972,7 @@ midi-def.o midi-def.lo: midi-def.cc include/misc.hh \
        include/translator-group.hh include/global-translator.hh \
        ../flower/include/pqueue.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-midi-item.o midi-item.lo: midi-item.cc ../lib/include/proto.hh \
+midi-item.o: midi-item.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -1969,7 +1995,7 @@ midi-item.o midi-item.lo: midi-item.cc ../lib/include/proto.hh \
        include/musical-request.hh include/midi-item.hh \
        include/midi-stream.hh include/audio-item.hh \
        include/audio-element.hh
-midi-stream.o midi-stream.lo: midi-stream.cc ../flower/include/string.hh \
+midi-stream.o: midi-stream.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -1988,7 +2014,7 @@ midi-stream.o midi-stream.lo: midi-stream.cc ../flower/include/string.hh \
        ../flower/include/virtual-methods.hh include/midi-stream.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-midi-walker.o midi-walker.lo: midi-walker.cc include/midi-walker.hh \
+midi-walker.o: midi-walker.cc include/midi-walker.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/plist.hh \
        ../flower/include/list.hh ../flower/include/list.icc \
@@ -2006,7 +2032,7 @@ midi-walker.o midi-walker.lo: midi-walker.cc include/midi-walker.hh \
        ../flower/include/virtual-methods.hh include/audio-staff.hh \
        include/midi-item.hh include/midi-stream.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-misc.o misc.lo: misc.cc include/item.hh include/boxes.hh \
+misc.o: misc.cc 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 \
@@ -2021,7 +2047,7 @@ misc.o misc.lo: misc.cc include/item.hh include/boxes.hh \
        include/direction.hh include/misc.hh ../lib/include/moment.hh \
        ../flower/include/rational.hh ../flower/include/scalar.hh \
        include/grouping.hh include/minterval.hh
-molecule.o molecule.lo: molecule.cc ../flower/include/interval.hh \
+molecule.o: molecule.cc ../flower/include/interval.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/compare.hh include/dimen.hh \
        ../flower/include/string.hh \
@@ -2038,7 +2064,7 @@ molecule.o molecule.lo: molecule.cc ../flower/include/interval.hh \
        include/direction.hh include/atom.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        include/tex.hh ../flower/include/scalar.hh
-music-iterator.o music-iterator.lo: music-iterator.cc include/debug.hh \
+music-iterator.o: music-iterator.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2062,7 +2088,7 @@ music-iterator.o music-iterator.lo: music-iterator.cc include/debug.hh \
        ../flower/include/assoc.hh ../flower/include/parray.hh \
        include/translation-property.hh include/change-iterator.hh \
        include/change-translator.hh
-music-list.o music-list.lo: music-list.cc include/music.hh \
+music-list.o: music-list.cc include/music.hh \
        ../flower/include/virtual-methods.hh ../lib/include/input.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh include/minterval.hh \
@@ -2078,9 +2104,8 @@ music-list.o music-list.lo: music-list.cc include/music.hh \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc
-music-output-def.o music-output-def.lo: music-output-def.cc \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../flower/include/string.hh \
+music-output-def.o: music-output-def.cc include/debug.hh \
+       ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2100,12 +2125,12 @@ music-output-def.o music-output-def.lo: music-output-def.cc \
        ../flower/include/rational.hh ../flower/include/pqueue.hh \
        ../flower/include/dictionary-iter.hh \
        ../flower/include/assoc-iter.hh
-music.o music.lo: music.cc include/music.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/minterval.hh \
-       ../flower/include/interval.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
+music.o: music.cc include/music.hh ../flower/include/virtual-methods.hh \
+       ../lib/include/input.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       include/minterval.hh ../flower/include/interval.hh \
+       ../flower/include/compare.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh include/lily-proto.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/music-list.hh \
@@ -2116,11 +2141,10 @@ music.o music.lo: music.cc include/music.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-musical-request.o musical-request.lo: musical-request.cc \
-       include/musical-request.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/request.hh \
-       ../flower/include/string.hh \
+musical-request.o: musical-request.cc include/musical-request.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.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 \
@@ -2139,9 +2163,8 @@ musical-request.o musical-request.lo: musical-request.cc \
        ../flower/include/link.hh ../flower/include/link.icc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc
-my-lily-lexer.o my-lily-lexer.lo: my-lily-lexer.cc \
-       include/notename-table.hh ../flower/include/pointer.hh \
-       ../flower/include/string.hh \
+my-lily-lexer.o: my-lily-lexer.cc include/notename-table.hh \
+       ../flower/include/pointer.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2158,12 +2181,11 @@ my-lily-lexer.o my-lily-lexer.lo: my-lily-lexer.cc \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh ../lib/include/source-file.hh \
        include/parseconstruct.hh
-my-lily-parser.o my-lily-parser.lo: my-lily-parser.cc \
-       include/my-lily-parser.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../lib/include/duration.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       ../lib/include/duration.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/varray.hh \
@@ -2181,7 +2203,7 @@ my-lily-parser.o my-lily-parser.lo: my-lily-parser.cc \
        include/request.hh include/direction.hh \
        include/command-request.hh parser.hh include/header.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh
-note-column.o note-column.lo: note-column.cc include/dot-column.hh \
+note-column.o: note-column.cc include/dot-column.hh \
        include/horizontal-group-item.hh include/elem-group.hh \
        include/score-elem.hh ../flower/include/parray.hh \
        ../flower/include/varray.hh \
@@ -2210,11 +2232,10 @@ note-column.o note-column.lo: note-column.cc include/dot-column.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc include/rest.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-note-head.o note-head.lo: note-head.cc include/misc.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+note-head.o: note-head.cc include/misc.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/scalar.hh ../flower/include/string.hh \
        ../flower/include/string-handle.hh \
@@ -2240,12 +2261,11 @@ note-head.o note-head.lo: note-head.cc include/misc.hh \
        include/musical-request.hh include/request.hh \
        ../lib/include/input.hh include/music.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh
-note-performer.o note-performer.lo: note-performer.cc \
-       include/note-performer.hh include/performer.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 \
+note-performer.o: note-performer.cc include/note-performer.hh \
+       include/performer.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 \
@@ -2260,7 +2280,7 @@ note-performer.o note-performer.lo: note-performer.cc \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/audio-item.hh include/audio-element.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-note.o note.lo: note.cc include/my-lily-lexer.hh include/lily-proto.hh \
+note.o: note.cc include/my-lily-lexer.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/varray.hh \
        ../flower/include/string.hh \
@@ -2283,9 +2303,8 @@ note.o note.lo: note.cc include/my-lily-lexer.hh include/lily-proto.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/identifier.hh include/text-def.hh \
        include/general-script-def.hh include/parseconstruct.hh
-notename-table.o notename-table.lo: notename-table.cc \
-       include/notename-table.hh ../flower/include/pointer.hh \
-       ../flower/include/string.hh \
+notename-table.o: notename-table.cc include/notename-table.hh \
+       ../flower/include/pointer.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2299,16 +2318,16 @@ notename-table.o notename-table.lo: notename-table.cc \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/direction.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh
-offset.o offset.lo: offset.cc ../flower/include/string.hh \
+offset.o: offset.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
        include/offset.hh include/axes.hh
-outputter.o outputter.lo: outputter.cc include/outputter.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/tex-stream.hh ../flower/include/string.hh \
+outputter.o: outputter.cc include/outputter.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh include/tex-stream.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
@@ -2321,10 +2340,9 @@ outputter.o outputter.lo: outputter.cc include/outputter.hh \
        ../flower/include/interval.hh include/offset.hh include/axes.hh \
        include/direction.hh ../flower/include/varray.hh \
        include/dimen.hh include/tex.hh ../flower/include/scalar.hh
-p-col.o p-col.lo: 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 \
+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 \
        ../flower/include/virtual-methods.hh \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh \
@@ -2345,7 +2363,7 @@ p-col.o p-col.lo: p-col.cc include/p-col.hh \
        ../flower/include/plist.icc 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.lo: p-score.cc include/main.hh include/lily-proto.hh \
+p-score.o: p-score.cc include/main.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh include/super-elem.hh \
        include/score-elem.hh ../flower/include/parray.hh \
@@ -2378,7 +2396,7 @@ p-score.o p-score.lo: p-score.cc include/main.hh include/lily-proto.hh \
        include/item.hh include/header.hh include/word-wrap.hh \
        include/break.hh include/gourlay-breaking.hh \
        include/outputter.hh
-paper-def.o paper-def.lo: paper-def.cc ../flower/include/string.hh \
+paper-def.o: paper-def.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2407,7 +2425,7 @@ paper-def.o paper-def.lo: paper-def.cc ../flower/include/string.hh \
        include/translator-group.hh include/global-translator.hh \
        ../flower/include/pqueue.hh include/p-score.hh \
        include/colhpos.hh include/music-output.hh include/main.hh
-parser.o parser.lo: parser.cc ../flower/include/scalar.hh \
+parser.o: parser.cc ../flower/include/scalar.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2442,7 +2460,7 @@ parser.o parser.lo: parser.cc ../flower/include/scalar.hh \
        ../flower/include/parray.hh include/score.hh \
        include/music-list.hh include/header.hh \
        ../lib/include/duration-convert.hh include/change-translator.hh
-performance.o performance.lo: performance.cc include/debug.hh \
+performance.o: performance.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2464,8 +2482,7 @@ performance.o performance.lo: performance.cc include/debug.hh \
        include/audio-element.hh include/performance.hh \
        include/music-output.hh include/score.hh \
        ../lib/include/input.hh ../flower/include/parray.hh
-performer-group-performer.o performer-group-performer.lo: \
-       performer-group-performer.cc \
+performer-group-performer.o: performer-group-performer.cc \
        include/performer-group-performer.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/parray.hh \
@@ -2489,18 +2506,17 @@ performer-group-performer.o performer-group-performer.lo: \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/translator-group.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-performer.o performer.lo: performer.cc \
-       include/performer-group-performer.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/parray.hh \
-       ../flower/include/varray.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/compare.hh \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/performer.hh include/request.hh \
-       ../flower/include/string.hh \
+performer.o: performer.cc include/performer-group-performer.hh \
+       include/lily-proto.hh ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       ../flower/include/parray.hh ../flower/include/varray.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/compare.hh ../flower/include/pcursor.hh \
+       ../flower/include/cursor.icc ../flower/include/iterate.hh \
+       ../flower/include/plist.icc include/performer.hh \
+       include/request.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../lib/include/moment.hh \
@@ -2513,12 +2529,11 @@ performer.o performer.lo: performer.cc \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/translator-group.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-pitch-squash-grav.o pitch-squash-grav.lo: pitch-squash-grav.cc \
-       include/pitch-squash-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 \
+pitch-squash-grav.o: pitch-squash-grav.cc include/pitch-squash-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 \
@@ -2534,11 +2549,10 @@ pitch-squash-grav.o pitch-squash-grav.lo: pitch-squash-grav.cc \
        include/offset.hh include/axes.hh include/score-elem.hh \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/drul-array.hh
-plet-engraver.o plet-engraver.lo: plet-engraver.cc \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/musical-request.hh \
-       include/lily-proto.hh include/request.hh \
-       ../flower/include/string.hh \
+plet-engraver.o: plet-engraver.cc ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       include/musical-request.hh include/lily-proto.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 \
@@ -2568,7 +2582,7 @@ plet-engraver.o plet-engraver.lo: plet-engraver.cc \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/item.hh include/boxes.hh include/stem.hh \
        include/molecule.hh
-plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.hh \
+plet-spanner.o: plet-spanner.cc include/atom.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2599,11 +2613,11 @@ plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.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.lo: \
-       plet-swallow-engraver.cc include/musical-request.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/request.hh ../flower/include/string.hh \
+plet-swallow-engraver.o: plet-swallow-engraver.cc \
+       include/musical-request.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.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 \
@@ -2618,11 +2632,11 @@ plet-swallow-engraver.o plet-swallow-engraver.lo: \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/parray.hh
-priority-halign-grav.o priority-halign-grav.lo: priority-halign-grav.cc \
-       include/bar.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 \
+priority-halign-grav.o: priority-halign-grav.cc include/bar.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 \
@@ -2643,17 +2657,17 @@ priority-halign-grav.o priority-halign-grav.lo: priority-halign-grav.cc \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/score-priority-grav.hh
-property-iterator.o property-iterator.lo: property-iterator.cc \
-       include/property-iterator.hh include/music-iterator.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/varray.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
+property-iterator.o: property-iterator.cc include/property-iterator.hh \
+       include/music-iterator.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       ../flower/include/varray.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/virtual-methods.hh \
        include/translation-property.hh include/music.hh \
@@ -2664,7 +2678,7 @@ property-iterator.o property-iterator.lo: property-iterator.cc \
        include/translator-group.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/parray.hh
-ps-plet.o ps-plet.lo: ps-plet.cc include/main.hh include/lily-proto.hh \
+ps-plet.o: ps-plet.cc include/main.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh include/misc.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
@@ -2688,7 +2702,7 @@ ps-plet.o ps-plet.lo: ps-plet.cc include/main.hh include/lily-proto.hh \
        ../flower/include/virtual-methods.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/string-convert.hh
-qlp.o qlp.lo: qlp.cc include/debug.hh ../flower/include/dstream.hh \
+qlp.o: qlp.cc include/debug.hh ../flower/include/dstream.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2700,7 +2714,7 @@ qlp.o qlp.lo: qlp.cc include/debug.hh ../flower/include/dstream.hh \
        ../flower/include/matrix-storage.hh ../flower/include/varray.hh \
        ../flower/include/virtual-methods.hh \
        ../flower/include/vector.hh
-qlpsolve.o qlpsolve.lo: qlpsolve.cc include/ineq-constrained-qp.hh \
+qlpsolve.o: qlpsolve.cc include/ineq-constrained-qp.hh \
        ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \
        ../flower/include/varray.hh ../flower/include/real.hh \
        ../flower/include/virtual-methods.hh \
@@ -2712,8 +2726,8 @@ qlpsolve.o qlpsolve.lo: qlpsolve.cc include/ineq-constrained-qp.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../lib/include/warn.hh ../flower/include/choleski.hh
-request-iterator.o request-iterator.lo: request-iterator.cc \
-       include/translator-group.hh ../flower/include/string.hh \
+request-iterator.o: request-iterator.cc include/translator-group.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2735,8 +2749,7 @@ request-iterator.o request-iterator.lo: request-iterator.cc \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/request.hh \
        include/direction.hh
-request.o request.lo: request.cc include/request.hh \
-       ../flower/include/string.hh \
+request.o: request.cc include/request.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2747,9 +2760,8 @@ request.o request.lo: request.cc include/request.hh \
        ../flower/include/interval.hh include/lily-proto.hh \
        include/direction.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-rest-collision-grav.o rest-collision-grav.lo: rest-collision-grav.cc \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../flower/include/string.hh \
+rest-collision-grav.o: rest-collision-grav.cc include/debug.hh \
+       ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2773,7 +2785,7 @@ rest-collision-grav.o rest-collision-grav.lo: rest-collision-grav.cc \
        include/axis-group-item.hh include/axis-group-element.hh \
        include/axis-group-administration.hh include/elem-group.hh \
        include/note-column.hh include/script-column.hh
-rest-collision.o rest-collision.lo: rest-collision.cc include/debug.hh \
+rest-collision.o: rest-collision.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2803,11 +2815,11 @@ rest-collision.o rest-collision.lo: rest-collision.cc include/debug.hh \
        include/collision.hh include/paper-def.hh \
        include/music-output-def.hh ../flower/include/dictionary.hh \
        ../flower/include/assoc.hh
-rest-grav.o rest-grav.lo: rest-grav.cc include/rest-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 \
+rest-grav.o: rest-grav.cc include/rest-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 \
@@ -2825,7 +2837,7 @@ rest-grav.o rest-grav.lo: rest-grav.cc include/rest-grav.hh \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/drul-array.hh \
        include/rest.hh include/rhythmic-head.hh
-rest.o rest.lo: rest.cc include/molecule.hh include/lily-proto.hh \
+rest.o: rest.cc include/molecule.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/plist.hh \
        ../flower/include/list.hh ../flower/include/list.icc \
@@ -2851,7 +2863,7 @@ rest.o rest.lo: rest.cc include/molecule.hh include/lily-proto.hh \
        include/dots.hh include/axis-group-element.hh \
        include/axis-group-administration.hh include/p-score.hh \
        include/colhpos.hh include/music-output.hh
-rhythmic-column-grav.o rhythmic-column-grav.lo: rhythmic-column-grav.cc \
+rhythmic-column-grav.o: rhythmic-column-grav.cc \
        include/rhythmic-column-grav.hh include/engraver.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2884,11 +2896,11 @@ rhythmic-column-grav.o rhythmic-column-grav.lo: rhythmic-column-grav.cc \
        include/axis-group-administration.hh include/elem-group.hh \
        include/script.hh include/staff-side.hh include/dot-column.hh \
        include/horizontal-group-item.hh
-rhythmic-head.o rhythmic-head.lo: rhythmic-head.cc \
-       include/rhythmic-head.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 \
+rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.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 \
@@ -2912,11 +2924,11 @@ rhythmic-head.o rhythmic-head.lo: rhythmic-head.cc \
        include/axis-group-element.hh \
        include/axis-group-administration.hh include/p-score.hh \
        include/colhpos.hh include/music-output.hh
-score-bar.o score-bar.lo: 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 ../flower/include/compare.hh \
-       include/offset.hh include/axes.hh ../flower/include/string.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 \
+       ../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 \
@@ -2926,7 +2938,7 @@ score-bar.o score-bar.lo: score-bar.cc include/score-bar.hh \
        include/graphical-element.hh include/lily-proto.hh \
        ../lib/include/proto.hh include/drul-array.hh \
        include/direction.hh
-score-column.o score-column.lo: score-column.cc include/debug.hh \
+score-column.o: score-column.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -2950,9 +2962,8 @@ score-column.o score-column.lo: score-column.cc include/debug.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
-score-elem-info.o score-elem-info.lo: score-elem-info.cc \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       ../flower/include/string.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 \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -2963,10 +2974,9 @@ score-elem-info.o score-elem-info.lo: score-elem-info.cc \
        ../flower/include/virtual-methods.hh ../lib/include/input.hh \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/direction.hh
-score-elem.o score-elem.lo: score-elem.cc include/outputter.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/p-score.hh include/colhpos.hh \
+score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh include/p-score.hh include/colhpos.hh \
        ../flower/include/varray.hh ../flower/include/parray.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -2993,9 +3003,8 @@ score-elem.o score-elem.lo: score-elem.cc include/outputter.hh \
        include/p-col.hh include/horizontal-group-item.hh \
        include/elem-group.hh include/axis-group-element.hh \
        include/axis-group-administration.hh include/axis-group-item.hh
-score-grav.o score-grav.lo: score-grav.cc include/super-elem.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
+score-grav.o: score-grav.cc include/super-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 \
@@ -3031,18 +3040,18 @@ score-grav.o score-grav.lo: score-grav.cc include/super-elem.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/command-request.hh include/paper-def.hh \
        include/music-output-def.hh
-score-performer.o score-performer.lo: score-performer.cc \
-       include/score-performer.hh include/performer-group-performer.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/parray.hh ../flower/include/varray.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/performer.hh \
-       include/request.hh ../flower/include/string.hh \
+score-performer.o: score-performer.cc include/score-performer.hh \
+       include/performer-group-performer.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../flower/include/parray.hh \
+       ../flower/include/varray.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       include/performer.hh include/request.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../lib/include/moment.hh \
@@ -3063,7 +3072,7 @@ score-performer.o score-performer.lo: score-performer.cc \
        ../lib/include/warn.hh include/score.hh \
        ../lib/include/source-file.hh ../lib/include/source.hh \
        include/audio-staff.hh
-score-priority-grav.o score-priority-grav.lo: score-priority-grav.cc \
+score-priority-grav.o: score-priority-grav.cc \
        include/horizontal-group-item.hh include/elem-group.hh \
        include/score-elem.hh ../flower/include/parray.hh \
        ../flower/include/varray.hh \
@@ -3088,7 +3097,7 @@ score-priority-grav.o score-priority-grav.lo: score-priority-grav.cc \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/assoc-iter.hh include/break-align-item.hh \
        include/horizontal-align-item.hh
-score.o score.lo: score.cc include/score.hh ../flower/include/varray.hh \
+score.o: score.cc include/score.hh ../flower/include/varray.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
@@ -3114,12 +3123,11 @@ score.o score.lo: score.cc include/score.hh ../flower/include/varray.hh \
        ../flower/include/scalar.hh ../flower/include/pqueue.hh \
        include/header.hh ../flower/include/cpu-timer.hh \
        include/main.hh include/paper-def.hh
-scoreline.o scoreline.lo: scoreline.cc include/scoreline.hh \
-       include/colhpos.hh ../flower/include/varray.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/spanner.hh include/score-elem.hh \
-       ../flower/include/parray.hh \
+scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.hh \
+       ../flower/include/varray.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh include/spanner.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 \
@@ -3141,7 +3149,7 @@ scoreline.o scoreline.lo: scoreline.cc include/scoreline.hh \
        include/elem-group.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.lo: scores.cc include/main.hh include/lily-proto.hh \
+scores.o: scores.cc include/main.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh include/score.hh \
        ../flower/include/varray.hh ../flower/include/plist.hh \
@@ -3161,8 +3169,7 @@ scores.o scores.lo: scores.cc include/main.hh include/lily-proto.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/header.hh include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-script-column.o script-column.lo: script-column.cc \
-       include/script-column.hh \
+script-column.o: script-column.cc include/script-column.hh \
        include/horizontal-vertical-group-item.hh \
        include/axis-group-item.hh include/axis-group-element.hh \
        include/score-elem.hh ../flower/include/parray.hh \
@@ -3190,7 +3197,7 @@ script-column.o script-column.lo: script-column.cc \
        ../flower/include/link.icc ../flower/include/pcursor.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc
-script-def.o script-def.lo: script-def.cc include/debug.hh \
+script-def.o: script-def.cc include/debug.hh \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -3211,11 +3218,11 @@ script-def.o script-def.lo: script-def.cc include/debug.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/lookup.hh ../flower/include/scalar.hh
-script-grav.o script-grav.lo: script-grav.cc include/script-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 \
+script-grav.o: script-grav.cc include/script-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 \
@@ -3240,8 +3247,7 @@ script-grav.o script-grav.lo: script-grav.cc include/script-grav.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/staff-sym.hh include/spanner.hh \
        include/general-script-def.hh
-script.o script.lo: script.cc include/script-def.hh \
-       ../flower/include/string.hh \
+script.o: script.cc include/script-def.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -3267,7 +3273,7 @@ script.o script.lo: script.cc include/script-def.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
-slur-grav.o slur-grav.lo: slur-grav.cc ../lib/include/proto.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 \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -3301,7 +3307,7 @@ slur-grav.o slur-grav.lo: slur-grav.cc ../lib/include/proto.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
-slur.o slur.lo: slur.cc include/slur.hh include/directional-spanner.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 \
        ../flower/include/real.hh include/score-elem.hh \
@@ -3331,11 +3337,11 @@ slur.o slur.lo: slur.cc include/slur.hh include/directional-spanner.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
-span-bar-grav.o span-bar-grav.lo: span-bar-grav.cc include/span-bar.hh \
-       include/bar.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 \
+span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.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 \
@@ -3355,8 +3361,8 @@ span-bar-grav.o span-bar-grav.lo: span-bar-grav.cc include/span-bar.hh \
        include/vertical-align-elem.hh include/elem-group.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh
-span-bar.o span-bar.lo: span-bar.cc include/dimen.hh \
-       ../flower/include/real.hh ../flower/include/string.hh \
+span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.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 \
@@ -3381,9 +3387,9 @@ span-bar.o span-bar.lo: span-bar.cc include/dimen.hh \
        include/vertical-align-elem.hh include/elem-group.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh
-span-score-bar-grav.o span-score-bar-grav.lo: 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 \
+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 \
        ../flower/include/real.hh ../flower/include/interval.hh \
        ../flower/include/compare.hh include/offset.hh include/axes.hh \
        ../flower/include/string.hh \
@@ -3403,9 +3409,9 @@ span-score-bar-grav.o span-score-bar-grav.lo: span-score-bar-grav.cc \
        include/score-elem-info.hh ../flower/include/scalar.hh \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh
-span-score-bar.o span-score-bar.lo: span-score-bar.cc \
-       include/span-score-bar.hh include/span-bar.hh include/bar.hh \
-       include/item.hh include/boxes.hh ../flower/include/fproto.hh \
+span-score-bar.o: span-score-bar.cc include/span-score-bar.hh \
+       include/span-bar.hh include/bar.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 \
@@ -3427,8 +3433,8 @@ span-score-bar.o span-score-bar.lo: span-score-bar.cc \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/lookup.hh ../flower/include/scalar.hh
-spanner.o spanner.lo: spanner.cc include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
+spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -3451,20 +3457,19 @@ spanner.o spanner.lo: spanner.cc include/debug.hh \
        ../flower/include/cursor.icc ../flower/include/iterate.hh \
        ../flower/include/plist.icc include/p-score.hh \
        include/colhpos.hh include/music-output.hh include/outputter.hh
-spring-spacer.o spring-spacer.lo: spring-spacer.cc \
-       include/spring-spacer.hh include/line-spacer.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/varray.hh ../flower/include/vector.hh \
-       ../flower/include/interval.hh ../flower/include/compare.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/col-info.hh ../flower/include/pointer.hh \
-       include/colhpos.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
+spring-spacer.o: spring-spacer.cc include/spring-spacer.hh \
+       include/line-spacer.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../flower/include/varray.hh \
+       ../flower/include/vector.hh ../flower/include/interval.hh \
+       ../flower/include/compare.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/col-info.hh \
+       ../flower/include/pointer.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/score-elem.hh ../flower/include/parray.hh \
@@ -3485,7 +3490,7 @@ spring-spacer.o spring-spacer.lo: spring-spacer.cc \
        include/paper-def.hh include/music-output-def.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/dimen.hh include/main.hh
-staff-info.o staff-info.lo: staff-info.cc ../lib/include/proto.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 \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -3508,18 +3513,18 @@ staff-info.o staff-info.lo: staff-info.cc ../lib/include/proto.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/item.hh include/boxes.hh include/drul-array.hh \
        include/direction.hh
-staff-performer.o staff-performer.lo: staff-performer.cc \
-       include/staff-performer.hh include/performer-group-performer.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/parray.hh ../flower/include/varray.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/performer.hh \
-       include/request.hh ../flower/include/string.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 \
+       ../flower/include/real.hh ../flower/include/parray.hh \
+       ../flower/include/varray.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       include/performer.hh include/request.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../lib/include/moment.hh \
@@ -3534,7 +3539,7 @@ staff-performer.o staff-performer.lo: staff-performer.cc \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        include/audio-column.hh include/audio-item.hh \
        include/audio-element.hh include/audio-staff.hh
-staff-side.o staff-side.lo: staff-side.cc ../flower/include/interval.hh \
+staff-side.o: staff-side.cc ../flower/include/interval.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/compare.hh include/paper-def.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
@@ -3556,12 +3561,11 @@ staff-side.o staff-side.lo: staff-side.cc ../flower/include/interval.hh \
        include/direction.hh include/staff-sym.hh include/spanner.hh \
        include/drul-array.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-staff-sym-grav.o staff-sym-grav.lo: staff-sym-grav.cc \
-       include/staff-sym-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 \
+staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-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 \
@@ -3586,11 +3590,11 @@ staff-sym-grav.o staff-sym-grav.lo: staff-sym-grav.cc \
        include/elem-group.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.lo: staff-sym.cc include/staff-sym.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 \
+staff-sym.o: staff-sym.cc include/staff-sym.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 \
@@ -3612,11 +3616,11 @@ staff-sym.o staff-sym.lo: staff-sym.cc include/staff-sym.hh \
        include/molecule.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        include/dimen.hh
-stem-grav.o stem-grav.lo: stem-grav.cc include/stem-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 \
+stem-grav.o: stem-grav.cc include/stem-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 \
@@ -3641,7 +3645,7 @@ stem-grav.o stem-grav.lo: stem-grav.cc include/stem-grav.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        ../lib/include/duration-convert.hh include/misc.hh \
        include/grouping.hh include/abbrev.hh
-stem-info.o stem-info.lo: stem-info.cc ../lib/include/proto.hh \
+stem-info.o: stem-info.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        include/dimen.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -3668,7 +3672,7 @@ stem-info.o stem-info.lo: stem-info.cc ../lib/include/proto.hh \
        include/paper-def.hh include/music-output-def.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/lookup.hh include/stem-info.hh
-stem.o stem.lo: stem.cc include/stem.hh include/item.hh include/boxes.hh \
+stem.o: stem.cc include/stem.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 \
@@ -3699,9 +3703,8 @@ stem.o stem.lo: stem.cc include/stem.hh include/item.hh include/boxes.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.lo: super-elem.cc include/super-elem.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.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 \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh \
@@ -3720,7 +3723,7 @@ super-elem.o super-elem.lo: super-elem.cc include/super-elem.hh \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/music-output.hh include/outputter.hh
-swallow-grav.o swallow-grav.lo: swallow-grav.cc include/swallow-grav.hh \
+swallow-grav.o: swallow-grav.cc include/swallow-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 \
@@ -3736,7 +3739,7 @@ swallow-grav.o swallow-grav.lo: swallow-grav.cc include/swallow-grav.hh \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/parray.hh
-swallow-perf.o swallow-perf.lo: swallow-perf.cc include/swallow-perf.hh \
+swallow-perf.o: swallow-perf.cc include/swallow-perf.hh \
        include/performer.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/varray.hh \
@@ -3752,11 +3755,10 @@ swallow-perf.o swallow-perf.lo: swallow-perf.cc include/swallow-perf.hh \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/parray.hh
-symtable.o symtable.lo: symtable.cc include/misc.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+symtable.o: symtable.cc include/misc.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/scalar.hh ../flower/include/string.hh \
        ../flower/include/string-handle.hh \
@@ -3768,7 +3770,7 @@ symtable.o symtable.lo: symtable.cc include/misc.hh \
        include/axes.hh ../flower/include/assoc.hh \
        ../flower/include/assoc-iter.hh include/symtable.hh \
        ../flower/include/dictionary.hh
-template1.o template1.lo: template1.cc ../lib/include/proto.hh \
+template1.o: template1.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        include/idealspacing.hh include/lily-proto.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
@@ -3797,19 +3799,18 @@ template1.o template1.lo: template1.cc ../lib/include/proto.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/spanner.hh ../flower/include/pcursor.tcc \
        ../flower/include/plist.tcc
-template2.o template2.lo: template2.cc include/line-spacer.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/varray.hh ../flower/include/vector.hh \
-       ../flower/include/interval.hh ../flower/include/compare.hh \
-       ../flower/include/plist.tcc ../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/pcursor.tcc
-template3.o template3.lo: template3.cc include/atom.hh \
-       ../flower/include/string.hh \
+template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh ../flower/include/varray.hh \
+       ../flower/include/vector.hh ../flower/include/interval.hh \
+       ../flower/include/compare.hh ../flower/include/plist.tcc \
+       ../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/pcursor.tcc
+template3.o: template3.cc include/atom.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -3824,8 +3825,8 @@ template3.o template3.lo: template3.cc include/atom.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/direction.hh ../flower/include/plist.tcc \
        ../flower/include/pcursor.tcc
-template4.o template4.lo: template4.cc
-template5.o template5.lo: template5.cc ../lib/include/proto.hh \
+template4.o: template4.cc
+template5.o: template5.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -3834,7 +3835,7 @@ template5.o template5.lo: template5.cc ../lib/include/proto.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
        ../flower/include/interval.tcc ../flower/include/interval.hh \
        ../flower/include/flower-debug.hh ../flower/include/dstream.hh
-template6.o template6.lo: template6.cc ../lib/include/proto.hh \
+template6.o: template6.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.tcc ../flower/include/plist.hh \
        ../flower/include/list.hh ../flower/include/list.icc \
@@ -3850,7 +3851,7 @@ template6.o template6.lo: template6.cc ../lib/include/proto.hh \
        ../flower/include/scalar.hh ../flower/include/dictionary.hh \
        ../flower/include/assoc.hh ../flower/include/varray.hh \
        ../flower/include/parray.hh ../lib/include/input.hh
-template7.o template7.lo: template7.cc ../lib/include/proto.hh \
+template7.o: template7.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -3867,7 +3868,7 @@ template7.o template7.lo: template7.cc ../lib/include/proto.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/music-iterator.hh \
        ../flower/include/varray.hh
-template8.o template8.lo: template8.cc ../lib/include/proto.hh \
+template8.o: template8.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
@@ -3883,8 +3884,7 @@ template8.o template8.lo: template8.cc ../lib/include/proto.hh \
        ../flower/include/virtual-methods.hh include/audio-staff.hh \
        include/midi-item.hh ../flower/include/pcursor.tcc \
        ../flower/include/plist.tcc
-tex-beam.o tex-beam.lo: tex-beam.cc include/atom.hh \
-       ../flower/include/string.hh \
+tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -3907,11 +3907,11 @@ tex-beam.o tex-beam.lo: tex-beam.cc include/atom.hh \
        include/music-output-def.hh \
        ../flower/include/virtual-methods.hh \
        ../flower/include/string-convert.hh include/main.hh
-tex-slur.o tex-slur.lo: tex-slur.cc include/main.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/misc.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/compare.hh \
+tex-slur.o: tex-slur.cc include/main.hh include/lily-proto.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh include/misc.hh \
+       ../lib/include/moment.hh ../flower/include/rational.hh \
+       ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/scalar.hh ../flower/include/string.hh \
        ../flower/include/string-handle.hh \
@@ -3931,8 +3931,7 @@ tex-slur.o tex-slur.lo: tex-slur.cc include/main.hh \
        ../flower/include/virtual-methods.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        ../flower/include/string-convert.hh
-tex-stream.o tex-stream.lo: tex-stream.cc include/tex.hh \
-       ../flower/include/string.hh \
+tex-stream.o: tex-stream.cc include/tex.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -3942,7 +3941,7 @@ tex-stream.o tex-stream.lo: tex-stream.cc include/tex.hh \
        include/main.hh include/lily-proto.hh ../lib/include/proto.hh \
        include/tex-stream.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh
-tex.o tex.lo: tex.cc include/dimen.hh ../flower/include/real.hh \
+tex.o: tex.cc include/dimen.hh ../flower/include/real.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/string-handle.hh \
@@ -3951,8 +3950,8 @@ tex.o tex.lo: tex.cc include/dimen.hh ../flower/include/real.hh \
        include/offset.hh include/axes.hh ../flower/include/scalar.hh \
        include/atom.hh include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/varray.hh
-text-def.o text-def.lo: text-def.cc include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
+text-def.o: text-def.cc include/debug.hh ../flower/include/dstream.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -3973,7 +3972,7 @@ text-def.o text-def.lo: text-def.cc include/debug.hh \
        ../flower/include/assoc.hh include/molecule.hh \
        include/text-def.hh include/general-script-def.hh \
        ../lib/include/input.hh include/dimen.hh
-text-item.o text-item.lo: text-item.cc include/musical-request.hh \
+text-item.o: text-item.cc include/musical-request.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        include/request.hh ../flower/include/string.hh \
@@ -4002,7 +4001,7 @@ text-item.o text-item.lo: text-item.cc include/musical-request.hh \
        include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-text-spanner.o text-spanner.lo: text-spanner.cc include/molecule.hh \
+text-spanner.o: text-spanner.cc include/molecule.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
@@ -4029,11 +4028,11 @@ text-spanner.o text-spanner.lo: text-spanner.cc include/molecule.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.lo: 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 ../flower/include/varray.hh \
-       include/request.hh ../flower/include/string.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 \
+       ../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 \
@@ -4057,7 +4056,7 @@ tie-grav.o tie-grav.lo: tie-grav.cc include/tie-grav.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
-tie.o tie.lo: tie.cc include/paper-def.hh include/lily-proto.hh \
+tie.o: tie.cc include/paper-def.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../lib/include/moment.hh \
        ../flower/include/rational.hh ../flower/include/compare.hh \
@@ -4084,9 +4083,9 @@ tie.o tie.lo: tie.cc include/paper-def.hh include/lily-proto.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-time-description.o time-description.lo: time-description.cc \
-       include/time-description.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/compare.hh \
+time-description.o: time-description.cc include/time-description.hh \
+       ../lib/include/moment.hh ../flower/include/rational.hh \
+       ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        include/lily-proto.hh ../lib/include/proto.hh \
@@ -4094,7 +4093,7 @@ time-description.o time-description.lo: time-description.cc \
        ../flower/include/dstream.hh ../flower/include/string.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../lib/include/warn.hh
-timing-grav.o timing-grav.lo: timing-grav.cc include/score-grav.hh \
+timing-grav.o: timing-grav.cc include/score-grav.hh \
        include/engraver-group.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/parray.hh \
@@ -4121,9 +4120,8 @@ timing-grav.o timing-grav.lo: timing-grav.cc include/score-grav.hh \
        include/timing-translator.hh include/time-description.hh \
        include/grouping.hh include/command-request.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh
-timing-translator.o timing-translator.lo: timing-translator.cc \
-       include/timing-translator.hh include/translator.hh \
-       ../flower/include/string.hh \
+timing-translator.o: timing-translator.cc include/timing-translator.hh \
+       include/translator.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -4145,7 +4143,7 @@ timing-translator.o timing-translator.lo: timing-translator.cc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/global-translator.hh ../flower/include/pqueue.hh
-translation-property.o translation-property.lo: translation-property.cc \
+translation-property.o: translation-property.cc \
        include/translation-property.hh include/music.hh \
        ../flower/include/virtual-methods.hh ../lib/include/input.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
@@ -4157,15 +4155,15 @@ translation-property.o translation-property.lo: translation-property.cc \
        ../flower/include/international.hh ../flower/include/scalar.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-translator-ctors.o translator-ctors.lo: translator-ctors.cc \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.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/compare.hh \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/translator.hh ../flower/include/string.hh \
+translator-ctors.o: translator-ctors.cc ../lib/include/proto.hh \
+       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
+       ../flower/include/cursor.icc ../flower/include/iterate.hh \
+       ../flower/include/plist.icc include/translator.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/lily-proto.hh \
@@ -4175,8 +4173,8 @@ translator-ctors.o translator-ctors.lo: translator-ctors.cc \
        ../flower/include/parray.hh ../lib/include/input.hh \
        include/debug.hh ../flower/include/dstream.hh \
        ../lib/include/warn.hh
-translator-group.o translator-group.lo: translator-group.cc \
-       include/music-output-def.hh ../flower/include/string.hh \
+translator-group.o: translator-group.cc include/music-output-def.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -4194,7 +4192,7 @@ translator-group.o translator-group.lo: translator-group.cc \
        ../lib/include/input.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
        ../flower/include/rational.hh
-translator.o translator.lo: translator.cc include/translator.hh \
+translator.o: translator.cc include/translator.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -4214,7 +4212,7 @@ translator.o translator.lo: translator.cc include/translator.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        ../flower/include/dictionary-iter.hh \
        ../flower/include/assoc-iter.hh ../flower/include/rational.hh
-type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \
+type-swallow-trans.o: type-swallow-trans.cc \
        include/type-swallow-trans.hh include/translator.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -4231,13 +4229,13 @@ type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/direction.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh
-version.o version.lo: version.cc include/main.hh include/lily-proto.hh \
+version.o: version.cc include/main.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh
-vertical-align-elem.o vertical-align-elem.lo: vertical-align-elem.cc \
+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 \
@@ -4252,10 +4250,10 @@ vertical-align-elem.o vertical-align-elem.lo: vertical-align-elem.cc \
        include/lily-proto.hh ../lib/include/proto.hh \
        ../flower/include/interval.hh include/axis-group-element.hh \
        include/axis-group-administration.hh
-vertical-align-grav.o vertical-align-grav.lo: vertical-align-grav.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 \
+vertical-align-grav.o: vertical-align-grav.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 \
        ../flower/include/virtual-methods.hh \
        ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/offset.hh \
@@ -4282,12 +4280,12 @@ vertical-align-grav.o vertical-align-grav.lo: vertical-align-grav.cc \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
        include/vertical-align-spanner.hh include/spanner.hh \
        include/vertical-align-elem.hh
-vertical-align-spanner.o vertical-align-spanner.lo: \
-       vertical-align-spanner.cc include/vertical-align-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 \
+vertical-align-spanner.o: vertical-align-spanner.cc \
+       include/vertical-align-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 \
@@ -4299,13 +4297,12 @@ vertical-align-spanner.o vertical-align-spanner.lo: \
        include/direction.hh include/vertical-align-elem.hh \
        include/elem-group.hh include/axis-group-element.hh \
        include/axis-group-administration.hh
-vertical-group-spanner.o vertical-group-spanner.lo: \
-       vertical-group-spanner.cc 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 \
+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 \
+       ../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 \
@@ -4323,8 +4320,8 @@ vertical-group-spanner.o vertical-group-spanner.lo: \
        ../flower/include/link.hh ../flower/include/link.icc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
        ../flower/include/iterate.hh ../flower/include/plist.icc
-voice-iterator.o voice-iterator.lo: voice-iterator.cc \
-       include/translator-group.hh ../flower/include/string.hh \
+voice-iterator.o: voice-iterator.cc include/translator-group.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -4345,15 +4342,15 @@ voice-iterator.o voice-iterator.lo: voice-iterator.cc \
        ../flower/include/rational.hh include/music-list.hh \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh
-warn.o warn.lo: warn.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.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/compare.hh ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
+warn.o: warn.cc ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.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/compare.hh \
+       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       include/debug.hh ../flower/include/dstream.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/lily-proto.hh \
@@ -4364,12 +4361,11 @@ warn.o warn.lo: warn.cc ../lib/include/proto.hh \
        include/time-description.hh ../lib/include/source-file.hh \
        ../lib/include/source.hh include/main.hh \
        ../lib/include/input.hh
-word-wrap.o word-wrap.lo: word-wrap.cc include/word-wrap.hh \
-       include/break.hh ../flower/include/varray.hh \
-       ../flower/include/interval.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       include/colhpos.hh include/paper-def.hh \
+word-wrap.o: word-wrap.cc include/word-wrap.hh include/break.hh \
+       ../flower/include/varray.hh ../flower/include/interval.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       ../flower/include/compare.hh include/lily-proto.hh \
+       ../lib/include/proto.hh include/colhpos.hh include/paper-def.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh \
        include/music-output-def.hh ../flower/include/string.hh \
@@ -4426,38 +4422,41 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-               mostlyclean-tags mostlyclean-generic
+               mostlyclean-libtool mostlyclean-tags \
+               mostlyclean-generic
 
-clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
-               mostlyclean-am
+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+               clean-generic mostlyclean-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
-               distclean-generic clean-am
+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+               distclean-tags distclean-generic clean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-               maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-compile maintainer-clean-libtool \
+               maintainer-clean-tags maintainer-clean-generic \
+               distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
 
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
@@ -4466,7 +4465,8 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 .PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
 clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
 install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile install-data-recursive \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
@@ -4504,6 +4504,9 @@ parser.hh: parser.yy
 # # could be faster:
 # #    $(FLEX) -8 -Cf -t $< > $@
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in
index 9409ae7ea03c6654fad3a720a1aa0346438cb65c..7171e5dd95710355914867275a7646500d09b41a 100644 (file)
--- a/lily/include/Makefile.in
+++ b/lily/include/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./lily/include/Makefile.am.wild by bin/autowild
-# Do not edit
-# lily/include/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# lily/include/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -85,7 +95,7 @@ VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
 
-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 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-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
 
 EXTRA_DIST = Makefile.am.wild
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -112,21 +122,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -165,25 +180,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-tags mostlyclean-generic
 
 clean:  clean-tags clean-generic mostlyclean
 
 distclean:  distclean-tags distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
                distclean
@@ -197,6 +213,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/make/Makefile.in b/make/Makefile.in
index 11ccea30ef89d492afe5aea6db55df17298360be..fd0d1e75365068e6521aa73df3ac436641f3e51b 100644 (file)
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./make/Makefile.am.wild by bin/autowild
-# Do not edit
-# project  LilyPond -- the musical typesetter
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# project  LilyPond -- the musical typesetter
 # title           zucht
 # file    make/Makefile.am.dist
 #
@@ -54,12 +58,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -74,11 +80,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -166,25 +176,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -204,6 +215,9 @@ lilypond.spec: lilypond.spec.in ../VERSION
 %.lsm: %.lsm.in ../VERSION
        cat $< | $(SED_VERSION) | $(SED_DATE) > $@
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm
index 86d7d36233dcc3f030373201b5a9e417619e2b49..868e8f293ce92e1f94b0fb2e7e9948a66a7c1857 100644 (file)
--- a/make/lelievijver.lsm
+++ b/make/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
 Versie: 
-Inschrijf datum: 19MAR98
+Inschrijf datum: 24MAR98
 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 aa925a65639db2333e4961edc9e4a2be2bf33144..241eb8b49e9538e45138cbdf7846a0d78a6fa508 100644 (file)
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Version: 
-Entered-date: 19MAR98
+Entered-date: 24MAR98
 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 30799c5495343dbadc8446218314376d3dcec905..1d9ea56f927fc07b0b4ed68d11033f8d6a3940d7 100644 (file)
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
-%doc  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/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc 
+%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 Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book

diff --git a/mf/Makefile.in b/mf/Makefile.in
index 65930ff5e104929ba2cebfc8136c7f16ef614475..fd416832810f1bff7942e82a6274ecf1ca26404f 100644 (file)
--- a/mf/Makefile.in
+++ b/mf/Makefile.in
@@ -1,11 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./mf/Makefile.am.wild by bin/autowild
-# Do not edit
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
 # mf/Makefile.am.wild
 
 # subdir level:
@@ -50,12 +55,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -70,11 +77,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -96,20 +107,13 @@ outdir = .
 #
 
 TEXFILES = dimen.tex dyn.tex
-MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf
+MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf
 MFDEPS = $(outdir)/mf.dep
 EXTRA_DIST = Makefile.am.wild Rules.make $(MFFILES) $(TEXFILES) TODO README
 
 FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf
 FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf
 
-lyout = $(depth)/init
-texout = $(depth)/tex
-
-FONT_FILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf
-
-FET_FILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf
-
 lyout = $(depth)/init
 texout = $(depth)/tex
 LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
@@ -172,25 +176,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -218,13 +223,16 @@ localuninstall:
        for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done
        -rmdir $(MFDIR)/public/lilypond/
 
-include Rules.make
+include $(srcdir)/Rules.make
 
 # dependencies:
 #
 include $(MFDEPS)
 #
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in
index 988f61e4d3b92493ca48843b85d42d0fa0418083..cf4257fccaf5518e606dab1cfc75452b126e746d 100644 (file)
--- a/mi2mu/Makefile.in
+++ b/mi2mu/Makefile.in
@@ -1,11 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./mi2mu/Makefile.am.wild by bin/autowild
-# Do not edit
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for mi2mu
 # file    mi2mu/Makefile.am.wild
@@ -53,12 +58,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -73,11 +80,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -97,11 +108,12 @@ 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_LDADD = -llily -lflower
+# ugh -lfl bo lib/FlexLexer stuff
+mi2mu_LDADD = -llily -lflower -lfl
 
-mi2mu_LDFLAGS = -L../lib -L../flower
+mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
 
-INCLUDES = -Iinclude -I../lib/include -I../flower/include
+INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
 
 EXTRA_DIST = Makefile.am.wild VERSION TODO
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -119,7 +131,8 @@ mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o template.o \
 version.o
 mi2mu_DEPENDENCIES = 
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in TODO
 
 
@@ -132,7 +145,7 @@ OBJECTS = $(mi2mu_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .o
+.SUFFIXES: .S .c .cc .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mi2mu/Makefile
 
@@ -144,7 +157,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-       test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -155,13 +168,13 @@ install-binPROGRAMS: $(bin_PROGRAMS)
        $(mkinstalldirs) $(bindir)
        @list='$(bin_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo "  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
-            $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
          else :; fi; \
        done
 
 uninstall-binPROGRAMS:
-       $(NORMAL_UNINSTALL)
+       @$(NORMAL_UNINSTALL)
        list='$(bin_PROGRAMS)'; for p in $$list; do \
          rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
        done
@@ -169,21 +182,48 @@ uninstall-binPROGRAMS:
 .c.o:
        $(COMPILE) -c $<
 
+.s.o:
+       $(COMPILE) -c $<
+
+.S.o:
+       $(COMPILE) -c $<
+
 mostlyclean-compile:
-       rm -f *.o core
+       -rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-       rm -f *.tab.c
+       -rm -f *.tab.c
 
 maintainer-clean-compile:
 
+.c.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
 mi2mu: $(mi2mu_OBJECTS) $(mi2mu_DEPENDENCIES)
        @rm -f mi2mu
        $(CXXLINK) $(mi2mu_LDFLAGS) $(mi2mu_OBJECTS) $(mi2mu_LDADD) $(LIBS)
 .cc.o:
        $(CXXCOMPILE) -c $<
+.cc.lo:
+       $(LTCXXCOMPILE) -c $<
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -198,7 +238,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
@@ -208,7 +248,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+       done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
@@ -222,24 +264,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -254,15 +301,15 @@ distdir: $(DISTFILES)
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-main.o main.lo: main.cc ../flower/include/string-convert.hh \
+main.o: main.cc ../flower/include/string-convert.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -282,10 +329,10 @@ main.o main.lo: main.cc ../flower/include/string-convert.hh \
        include/midi-parser.hh include/mi2mu-proto.hh \
        ../flower/include/parray.hh include/mudela-item.hh \
        include/mudela-score.hh
-mi2mu-version.o mi2mu-version.lo: mi2mu-version.cc ../lib/config.hh
-midi-parser.o midi-parser.lo: midi-parser.cc \
-       ../flower/include/string-convert.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/string.hh \
+mi2mu-version.o: mi2mu-version.cc ../lib/config.hh
+midi-parser.o: midi-parser.cc ../flower/include/string-convert.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
@@ -293,9 +340,8 @@ midi-parser.o midi-parser.lo: midi-parser.cc \
        include/mi2mu-global.hh include/midi-parser.hh \
        ../lib/include/moment.hh ../flower/include/rational.hh \
        include/mi2mu-proto.hh
-midi-score-parser.o midi-score-parser.lo: midi-score-parser.cc \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+midi-score-parser.o: midi-score-parser.cc ../lib/include/moment.hh \
+       ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../lib/include/source-file.hh ../lib/include/proto.hh \
@@ -312,7 +358,7 @@ midi-score-parser.o midi-score-parser.lo: midi-score-parser.cc \
        include/midi-track-parser.hh include/mudela-item.hh \
        ../lib/include/duration.hh ../lib/include/plet.hh \
        include/mudela-score.hh
-midi-track-parser.o midi-track-parser.lo: midi-track-parser.cc \
+midi-track-parser.o: midi-track-parser.cc \
        ../flower/include/string-convert.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -331,18 +377,18 @@ midi-track-parser.o midi-track-parser.lo: midi-track-parser.cc \
        ../lib/include/plet.hh include/mudela-score.hh \
        ../flower/include/parray.hh ../flower/include/varray.hh \
        include/mudela-staff.hh
-mudela-column.o mudela-column.lo: mudela-column.cc \
-       include/mudela-column.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/mi2mu-proto.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/compare.hh \
+mudela-column.o: mudela-column.cc include/mudela-column.hh \
+       ../lib/include/proto.hh ../flower/include/fproto.hh \
+       ../flower/include/real.hh include/mi2mu-proto.hh \
+       ../lib/include/moment.hh ../flower/include/rational.hh \
+       ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.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
-mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \
+mudela-item.o: mudela-item.cc include/mi2mu-global.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -360,7 +406,7 @@ mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \
        ../flower/include/iterate.hh ../flower/include/plist.icc \
        include/mudela-item.hh include/mudela-stream.hh \
        include/mudela-score.hh ../flower/include/parray.hh
-mudela-score.o mudela-score.lo: mudela-score.cc ../lib/include/moment.hh \
+mudela-score.o: mudela-score.cc ../lib/include/moment.hh \
        ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -378,7 +424,7 @@ mudela-score.o mudela-score.lo: mudela-score.cc ../lib/include/moment.hh \
        include/mudela-item.hh include/mudela-score.hh \
        ../flower/include/parray.hh include/mudela-staff.hh \
        include/mudela-stream.hh
-mudela-staff.o mudela-staff.lo: mudela-staff.cc ../lib/include/moment.hh \
+mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \
        ../flower/include/rational.hh ../flower/include/compare.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -397,8 +443,8 @@ mudela-staff.o mudela-staff.lo: mudela-staff.cc ../lib/include/moment.hh \
        include/mudela-staff.hh include/mudela-stream.hh \
        include/mudela-voice.hh include/mudela-score.hh \
        ../flower/include/parray.hh
-mudela-stream.o mudela-stream.lo: mudela-stream.cc \
-       include/mi2mu-global.hh ../flower/include/string.hh \
+mudela-stream.o: mudela-stream.cc include/mi2mu-global.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string-handle.hh \
@@ -407,9 +453,9 @@ mudela-stream.o mudela-stream.lo: mudela-stream.cc \
        include/mi2mu-proto.hh ../lib/include/moment.hh \
        ../flower/include/rational.hh ../lib/include/duration.hh \
        ../lib/include/plet.hh include/mudela-stream.hh
-mudela-voice.o mudela-voice.lo: mudela-voice.cc \
-       ../flower/include/string-convert.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/string.hh \
+mudela-voice.o: mudela-voice.cc ../flower/include/string-convert.hh \
+       ../flower/include/fproto.hh ../flower/include/real.hh \
+       ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
        ../flower/include/international.hh ../flower/include/compare.hh \
@@ -424,7 +470,7 @@ mudela-voice.o mudela-voice.lo: mudela-voice.cc \
        include/mudela-item.hh ../lib/include/duration.hh \
        ../lib/include/plet.hh include/mudela-staff.hh \
        include/mudela-stream.hh include/mudela-voice.hh
-template.o template.lo: template.cc ../lib/include/proto.hh \
+template.o: template.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 \
@@ -441,7 +487,7 @@ template.o template.lo: 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
-version.o version.lo: version.cc ../lib/include/proto.hh \
+version.o: version.cc ../lib/include/proto.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
        ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
@@ -479,38 +525,41 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-               mostlyclean-tags mostlyclean-generic
+               mostlyclean-libtool mostlyclean-tags \
+               mostlyclean-generic
 
-clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
-               mostlyclean-am
+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+               clean-generic mostlyclean-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
-               distclean-generic clean-am
+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+               distclean-tags distclean-generic clean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-               maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-compile maintainer-clean-libtool \
+               maintainer-clean-tags maintainer-clean-generic \
+               distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
 
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
@@ -519,7 +568,8 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 .PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
 clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
 install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile install-data-recursive \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
@@ -532,6 +582,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in
index 33942a0b57941d88d85e83b14ba312829cc2dcb8..b9f1ba775b6b2dfbec1eaf6c6e6eaff364445d99 100644 (file)
--- a/mi2mu/include/Makefile.in
+++ b/mi2mu/include/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./mi2mu/include/Makefile.am.wild by bin/autowild
-# Do not edit
-# lib/include/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# lib/include/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -112,21 +122,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -165,25 +180,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-tags mostlyclean-generic
 
 clean:  clean-tags clean-generic mostlyclean
 
 distclean:  distclean-tags distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
                distclean
@@ -197,6 +213,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in
index 662106727ff36730e7bcc49ca223cce0bb225427..e5f001379aa143df90ec2d79ace7621d048df7dc 100644 (file)
--- a/mutopia/J.S.Bach/Makefile.in
+++ b/mutopia/J.S.Bach/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./mutopia/J.S.Bach/Makefile.am.wild by bin/autowild
-# Do not edit
-# mutopia/J.S.Bach/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# mutopia/J.S.Bach/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -149,25 +159,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -181,6 +192,9 @@ mostlyclean distclean maintainer-clean
 
 default: all $(OUTFILES)
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
+
 # 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.
 .NOEXPORT:

diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in
index f933c9e6722d9ac6a8bc80726f3d383b3771b79f..d217c71a80003e2367bca5f41f44657fa2661879 100644 (file)
--- a/mutopia/Makefile.in
+++ b/mutopia/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./mutopia/Makefile.am.wild by bin/autowild
-# Do not edit
-# mutopia/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# mutopia/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -126,7 +136,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       for subdir in $(SUBDIRS); do \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
@@ -136,7 +146,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        @set fnord $(MAKEFLAGS); amf=$$2; \
-       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+       done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
@@ -150,24 +162,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-       here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
        done; \
-       test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+       list='$(SOURCES) $(HEADERS)'; \
+       unique=`for i in $$list; do echo $$i; done | \
+         awk '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
+       -rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -182,11 +199,11 @@ distdir: $(DISTFILES)
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
@@ -216,19 +233,19 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
 clean-am:  clean-tags clean-generic mostlyclean-am
@@ -243,7 +260,8 @@ mostlyclean:  mostlyclean-recursive mostlyclean-am
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
@@ -262,6 +280,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 default: all $(OUTFILES)
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
 
 # 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.in b/tex/Makefile.in
index 5e26aa35b2e48ebdd1b427fd6c34e80927802114..209dac96d56fcbcfd3c03c8b3464b4897af5d3e5 100644 (file)
--- a/tex/Makefile.in
+++ b/tex/Makefile.in
@@ -1,12 +1,16 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Automatically generated from ./tex/Makefile.am.wild by bin/autowild
-# Do not edit
-# tex/Makefile.am.wild
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Generated automatically by wild-perl 0.1# tex/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AUTOHEADER = @AUTOHEADER@
 BISON = @BISON@
 CC = @CC@
@@ -67,11 +73,15 @@ FIND = @FIND@
 FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
+LD = @LD@
 LEX = @LEX@
+LIBTOOL = @LIBTOOL@
 LN = @LN@
+LN_S = @LN_S@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MFDIR = @MFDIR@
+NM = @NM@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POD2HTML = @POD2HTML@
@@ -85,10 +95,10 @@ VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
 
-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
+TEXFILES = dyndefs.tex eglerdefs.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 = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex
+CLEANFILES = 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../lib/config.hh
 CONFIG_CLEAN_FILES = 
@@ -147,25 +157,26 @@ installdirs:
 
 
 mostlyclean-generic:
-       test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-       test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-       test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-       test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
 
 distclean:  distclean-generic clean
-       rm -f config.status
+       -rm -f config.status
+       -rm -f libtool
 
 maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
@@ -184,6 +195,8 @@ install-data:
 uninstall-data:
        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 < $< > $@
 
 # 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.