]> git.donarmstrong.com Git - lilypond.git/commitdiff
release: 0.1.53 release/0.1.53
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 17 Mar 1998 08:53:34 +0000 (09:53 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 17 Mar 1998 08:53:34 +0000 (09:53 +0100)
132 files changed:
.dstreamrc
BUGS
Documentation/AUTHORS.pod
Documentation/Makefile.am
Documentation/Makefile.in
Documentation/PATCHES.pod
GNUmakefile [new file with mode: 0644]
Makefile.am
Makefile.am.wild
Makefile.in
NEWS
TODO
VERSION
acconfig.h
aclocal.m4
bin/Makefile.am
bin/Makefile.in
bin/autowild
bin/conflily.in
bin/lilypython.py
bin/make-patch.in
bin/wild-perl
config.hh.in
configure
configure.in
debian/Makefile.am
debian/Makefile.in
flower/AUTHORS [deleted file]
flower/COPYING [deleted file]
flower/ChangeLog [deleted file]
flower/GNUmakefile [new file with mode: 0644]
flower/INSTALL [deleted file]
flower/Makefile.am
flower/Makefile.am.wild
flower/Makefile.in
flower/acconfig.h [deleted file]
flower/aclocal.m4 [deleted file]
flower/config.hh.in [deleted file]
flower/configure [deleted file]
flower/configure.in [deleted file]
flower/flower-version.cc
flower/include/GNUmakefile [new file with mode: 0644]
flower/include/Makefile.am
flower/include/Makefile.am.wild
flower/include/Makefile.in
flower/include/rational.hh
flower/missing [deleted file]
flower/mkinstalldirs [deleted file]
flower/rational.cc
flower/stamp-h.in [deleted file]
flower/test/Makefile.am [deleted file]
flower/test/Makefile.am.wild [deleted file]
flower/test/Makefile.in [deleted file]
flower/test/flower-test.hh [deleted file]
flower/test/main.cc [deleted file]
flower/test/mat-test.cc [deleted file]
flower/test/pqtest.cc [deleted file]
flower/test/rattest.cc [deleted file]
flower/test/result [deleted file]
flower/test/stringtest.cc [deleted file]
flowertest/GNUmakefile [new file with mode: 0644]
flowertest/Makefile.am [new file with mode: 0644]
flowertest/Makefile.am.wild [new file with mode: 0644]
flowertest/Makefile.in [new file with mode: 0644]
flowertest/check.sh [new file with mode: 0644]
flowertest/result [new file with mode: 0644]
init/Makefile.am
init/Makefile.in
init/table16.ly
input/Makefile.am
input/Makefile.in
input/test-lyrics.ly
input/twinkle.ly
lib/GNUmakefile [new file with mode: 0644]
lib/Makefile.am
lib/Makefile.am.wild
lib/Makefile.in
lib/include/GNUmakefile [new file with mode: 0644]
lib/include/Makefile.am
lib/include/Makefile.am.wild
lib/include/Makefile.in
lib/template.cc
lily/GNUmakefile
lily/Makefile.am
lily/Makefile.am.wild
lily/Makefile.in
lily/VERSION
lily/dynamic-grav.cc
lily/include/GNUmakefile [new file with mode: 0644]
lily/include/Makefile.am
lily/include/Makefile.am.wild
lily/include/Makefile.in
lily/include/local-key-grav.hh
lily/include/p-col.hh
lily/include/rod.hh
lily/include/single-malt-grouping-item.hh
lily/local-key-grav.cc
lily/midi-item.cc
lily/p-col.cc
lily/rod.cc
lily/separating-group-spanner.cc
lily/single-malt-grouping-item.cc
lily/spring-spacer.cc
lily/staff-side.cc
lily/template4.cc
make/Makefile.am
make/Makefile.in
make/lelievijver.lsm
make/lilypond.lsm
make/lilypond.spec
mf/GNUmakefile [new file with mode: 0644]
mf/Makefile.am
mf/Makefile.am.wild
mf/Makefile.in
mf/Rules.make
mi2mu/GNUmakefile
mi2mu/Makefile.am
mi2mu/Makefile.am.wild
mi2mu/Makefile.in
mi2mu/include/GNUmakefile [new file with mode: 0644]
mi2mu/include/Makefile.am
mi2mu/include/Makefile.am.wild
mi2mu/include/Makefile.in
mutopia/J.S.Bach/Makefile.am
mutopia/J.S.Bach/Makefile.in
mutopia/J.S.Bach/wtk1-fugue2.ly
mutopia/Makefile.am
mutopia/Makefile.in
mutopia/los-toros-oboe-20.tex [new file with mode: 0644]
mutopia/los-toros-oboe.ly
tex/Makefile.am
tex/Makefile.in

index e38a4021003d220fc43f84304a73d171a45f4fe4..d016c2b727255f80aac394da9f184d1be23b052a 100644 (file)
@@ -7,7 +7,7 @@ Dstream                 1
 InitParser             1
 Parser                 1
 InitDeclarations       1
-Declarations           0
+Declarations           1
 # FlexLexer debug
 InitLexer              1
 Lexer                  1
@@ -17,79 +17,77 @@ walking             11
 
 # flower lib
 File_path              1
-Matrix                 1
-Vector                 1
+Matrix                 0
+Vector                 0
 
 # lily
-Atom                   0
-Bar                    0
-Beam                   0
-Change_iterator                0
-Chord                  0
-Chord_iterator         0
-Clef_item              0
-Col_configuration      0
-Colinfo                        0
-Colinfo                        0
-Collision              0
-Engraver               0
-Engraver_group_engraver 0
-Group_change_req       0
-Head_column            0
-Idealspacing           0
+Atom                   1
+Bar                    1
+Beam                   1
+Change_iterator                1
+Chord                  1
+Chord_iterator         1
+Clef_item              1
+Col_configuration      1
+Colinfo                        1
+Colinfo                        1
+Collision              1
+Engraver               1
+Engraver_group_engraver 1
+Group_change_req       1
+Head_column            1
+Idealspacing           1
 Ineq_constrained_qp    0
-Input_translator       0
-Item                   0
-Key_item               0
-Lookup                 0
-Line_spacer            0
-Melodic_req            0
-Midi_def               0
+Input_translator       1
+Item                   1
+Key_item               1
+Lookup                 1
+Line_spacer            1
+Melodic_req            1
+Midi_def               1
 Midistrings            0
 Mixed_qp               0
-Music                  0
-Music_iterator         0
+Music                  1
+Music_iterator         1
 My_lily_lexer          1
-Note_head              0
-Note_performer         0
-Note_req               0
-Paper_col                      1
+Note_head              1
+Note_performer         1
+Note_req               1
 Paper_score                    1
 Paper_def              1
-Paperdef               0
-Performer              0
-Performer_group_performer      0
-Request                        0
+Performer              1
+Performer_group_performer      1
+Request                        1
 Request_iterator       1
-Rest_collision         0
-Rest_collision_engraver 0
-Rest_req               0
-Rhythmic_req           0
+Rest_collision         1
+Rest_collision_engraver 1
+Rest_req               1
+Rhythmic_req           1
 Score                  1
 Score_column           0
 Score_elem             0
-Score_engraver         0
-Score_performer                0
-Script_column          0
-Script_def             0
-Script_req             0
-Slur                   0
-Spacing_problem        0
-Spanner                        0
+Score_engraver         1
+Score_performer                1
+Script_column          1
+Script_def             1
+Script_req             1
+Slur                   1
+Spacing_problem        1
+Spanner                        1
 Spring_spacer          0
-Staff                  0
-Staff_commands         0
-Stem                   0
-Stem                   0
-Stem_req               0
-Symtable               0
-Symtables              0
+Staff                  1
+Staff_commands         1
+Stem                   1
+Stem                   1
+Stem_req               1
+Symtable               1
+Symtables              1
 
-Text_def               0
-Text_req               0
-Time_description       0
-Voice                  0
-Voice_iterator         0
+Text_def               1
+Text_req               1
+Time_description       1
+Voice                  1
+Voice_iterator         1
 Word_wrap              0
 delete_identifiers     1
 parse_duration         1
diff --git a/BUGS b/BUGS
index 6c32757d6a7a3312b2eb868cd42523eb316237c0..384fb5ce6bf735f2ac1edbe9e0ccd748a0137aa9 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,21 +1,21 @@
-Document Really Ugly Bugs (coredumps, assert fails, etc)
-
+\score{
+       \melodic{
+               [c2 c]
+       }
+}
+lilypond: ../flower/include/varray.hh:141: struct Rhythmic_grouping *& Array<Rhythmic_grouping *>::elem(int) const: Assertion `i >=0&&i<size_' failed.
+Aborted (core dumped)
 
 \score{
        \melodic{
-       [a8 a-2] /bla
+               [c]
        }
 }
-koor.ly: 4: error: parse error, expecting `DIGIT' or `UNSIGNED':
-        [a8 a-2] /bla
-                     
-koor.ly: 5: error: Have to be in Lyric mode for lyrics:
-        }
-         
-lilypond: parser.y:765: int yyparse(void *): Assertion `((My_lily_parser *) my_lily_parser_l)->post_reqs.empty ()' failed.
+lilypond: ../flower/include/cursor.tcc:104: int Cursor<void *>::operator -(class Cursor<void *>) const: Assertion `c.ok()' failed.
 Aborted (core dumped)
 
 
+
 [GNU libc]
 
 The GNU extension memmem() is known to be buggy on linux libc 5.0.9
@@ -23,10 +23,6 @@ and before. Glibc upto 2.0.5 also has problems with memmem (), but
 these should not affect LilyPond.
 
 
-[IRIX (5.3?)]
-
-coredump from strstream::strstream () upon the first read of a file
-
 [Linux Intel]
 
 LilyPond occasionally crashes while parsing the initialisation files.
index 3e377f910ea4a1acc20941660bff7b89422c871b..538b9c185249dc2f4c425a0c271feb9c0b6beeeb 100644 (file)
@@ -45,7 +45,7 @@ misc bugfixes, some Beam and Stem code.
 
 mf/ital-*.mf (these were taken from the CM fonts)
 
-=item * Alexandre Oliva <oliva@dcc.unicamp.br>, http://sunsite.unicamp.br/?
+=item * Alexandre Oliva <oliva@dcc.unicamp.br>, http://sunsite.unicamp.br/~oliva
 
 testing
 
index 66c0e424335992a63a2fcbed263ee911a744a04e..9942fb2d00a636d01e61bc6c1f410df1d990fba3 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./Documentation/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # Documentation/Makefile.am.wild
 
@@ -40,4 +38,4 @@ clean-local:
 
 include $(top_srcdir)/Documentation/Rules.make
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index c2e9724f86105ecb0359ded0e6561947da313571..6621a798694dedaf1ac3503fbd195d3371fccfc5 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./Documentation/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # Documentation/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -117,7 +118,7 @@ MAN1GROFF = $(addsuffix .1,$(MAN1FILES))
 
 outdir = .
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -225,7 +226,7 @@ clean-local:
 
 include $(top_srcdir)/Documentation/Rules.make
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index e98860d0824c212161d710458411d60b18e0e792..6e5e1a134c831258e827f3d211d50acdd4805eb9 100644 (file)
@@ -42,15 +42,14 @@ In F<NEWS>, enter a summary of changes:
        pl 0.1.48.jcn1
                - added PATCHES.pod
 
-Then, type something like
+Then, from the top of Lily's source tree, type
 
-    make dist
-    mv out/lilypond-0.1.48.jcn1.tar.gz ../releases
+    make distclean  # if you don't use --srcdir configure
     make-patch
 
 which leaves your patch as F<./patch-0.1.48.jcn1>.
 
-or even simpler:
+If you didn't configure Lily using --srcdir, you can do:
 
     release
 
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644 (file)
index 0000000..088d3b2
--- /dev/null
@@ -0,0 +1,37 @@
+# GNUmakefile
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+#ugh
+biltdir=../build
+
+make-in-build: wild-check
+       exec $(MAKE) -C $(biltdir)
+
+# include Makefile
+include $(biltdir)/Makefile
+
+SUBDIRS :=
+
+clean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+dist: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+distclean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+endif
+
+wild-check:
index c25099c607aae7db2eac7fc29efe6a7bd73964b0..09f1bcbe9bf95ec8852a7648ddd8c54321f757df 100644 (file)
@@ -1,17 +1,15 @@
-# Automatically generated from ./Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # title           top level makefile for LilyPond  
 # file    Makefile.am.wild
 
-SUBDIRS = bin flower lib lily mf mi2mu debian\
+SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\
        Documentation init input tex make mutopia
 
 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)
+EXTRA_DIST = Makefile.am.wild GNUmakefile .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
 
 
 INSTALL:
@@ -30,6 +28,16 @@ PATCHES:
 # a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
 # respect the directory
 distclean-local:
-       rm -f lib/config.hh
+       rm -f flower/config.hh
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 5d6cdeb6354c2bcb3c8d228a3c11357889259602..f3651acb950b29223cc0d7cc7d7965556ccbb703 100644 (file)
@@ -1,14 +1,14 @@
 # title           top level makefile for LilyPond  
 # file    Makefile.am.wild
 
-SUBDIRS = bin flower lib lily mf mi2mu debian\
+SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\
        Documentation init input tex make mutopia
 
 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)
+EXTRA_DIST = Makefile.am.wild GNUmakefile .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
 
 
 INSTALL:
@@ -27,4 +27,14 @@ PATCHES:
 # a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
 # respect the directory
 distclean-local:
-       rm -f lib/config.hh
+       rm -f flower/config.hh
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
+
index 3a43b1d71950a0856ba8f2b64ac4aef5f6b34894..e2c94dab9d42704294d107e48ba2b04fc215565c 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # title           top level makefile for LilyPond  
 # file    Makefile.am.wild
@@ -61,14 +59,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -76,6 +75,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -90,6 +90,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -98,17 +99,17 @@ YACC = @YACC@
 ZIP = @ZIP@
 absolute_builddir = @absolute_builddir@
 
-SUBDIRS = bin flower lib lily mf mi2mu debian\
+SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\
        Documentation init input tex make mutopia
 
 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)
+EXTRA_DIST = Makefile.am.wild GNUmakefile .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ./lib/config.hh
+CONFIG_HEADER = ./flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
@@ -141,7 +142,7 @@ config.hh: stamp-h
        @:
 stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
        cd $(top_builddir) \
-         && CONFIG_FILES= CONFIG_HEADERS=lib/config.hh:config.hh.in \
+         && CONFIG_FILES= CONFIG_HEADERS=flower/config.hh:config.hh.in \
             $(SHELL) ./config.status
        @echo timestamp > stamp-h
 $(srcdir)/config.hh.in: $(srcdir)/stamp-h.in
@@ -362,9 +363,19 @@ PATCHES:
 # a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
 # respect the directory
 distclean-local:
-       rm -f lib/config.hh
+       rm -f flower/config.hh
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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/NEWS b/NEWS
index 3d0c20d712484e750bac5aa5636e241ecc7c8034..7e4397d9ce7ce704e2f118088577d55f3b8d78b8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,40 @@
+pl 53
+       - bf: c4 \< c4 \< 
+       - bfs of spacing stuff
+
+
+pl 52.jcn6
+       - make check target
+       - moved flower/test to flowertest
+       - dist fixes
+       - flower no longer independent package
+       - bf: GNUmakefile
+       - bf's: configure: debugging (default) /profiling
+       - bf: Rational iface (fixes MIDI output)
+       - bf: non --srcdir configure + build with GNU make (ugh)
+       - ugh: autowildflower
+       - bf's: invoking wild-perl
+       - bf: ugh: staff-side.cc: placement height
+       - bf's: gnu 2.7.2 link (huh?, everyone using 2.8?)
+       - make-patch: default diff against (copy of) srcdir
+       - bin/conflily configures in ../build
+       - GNUmakefiles that do:
+         * auto-update of Makefile.am.wild
+         * auto-switch to builddir
+       - bf's: configure --srcdir
+       - fixes for los-toros/twinkle/test-lyrics
+       - latex file for los-toros (ugh)
+       - staff-side: symbols closer...
+       - half fix of midi output? duh.
+       - oboe1 los-toros
+
+************
 pl 52
        - split up elem-group stuff.
        - per line widths
        - miscellaneous fixes by WL.
 
+
 pl 51.jcn1
        - bf's: dutch->nederlands
        - Cygnus b19 compile/link fixes
diff --git a/TODO b/TODO
index 77ad05afaa046ab8d2a3426d4fd37f5d8f5d95fd..9347eb0f4bc5714eab7d5c1cc6ab630d849ac052 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,6 +8,10 @@ grep for TODO and ugh/ugr
 
 0.2:
 
+       * collisions for local_key.
+
+       * robustify Beam in case of no stems
+
        * latex quirk?
 
        * check for groff / troff/ nroff et
diff --git a/VERSION b/VERSION
index 03a63583e4bb52f6bca7bbf61dca77c44700a131..b4ef45ec975977dac718d4b1e31707fa5441b85a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=52
+PATCH_LEVEL=53
 MY_PATCH_LEVEL=
 
 # now used as shell script in configure too
index 2991969007422f2139b1bb7de09fa94ee0dd46b9..2e34d910d552025f8cf4364bdd115c606a0a6bc8 100644 (file)
 /* the toplevel version string */
 #define TOPLEVEL_VERSION "0"
 
+/* the version string of the flower lib */
+#define FLOWER_VERSION "0"
+
+/* define if you have memmem */
+#define HAVE_MEMMEM 0
+
+/* define if you have snprintf */
+#define HAVE_SNPRINTF 0
+
 #endif
+
index 3997befc4e7e563609029be1bbe2d42e4f75fd5f..de8271571a70f16d3b557ae3c2f8b7a762004088 100644 (file)
@@ -1,14 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2f
-
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+dnl aclocal.m4 generated automatically by aclocal 1.2
 
 
 AC_DEFUN(AC_JUNK_ARGS, [
@@ -119,8 +109,8 @@ fi
 ifelse([$3],,
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
+AM_SANITY_CHECK
+AC_ARG_PROGRAM
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -128,7 +118,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
+AC_PROG_MAKE_SET])
 
 
 # serial 1
@@ -155,21 +145,10 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
+   if test "$@" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
    test "[$]2" = conftestfile
    )
 then
index fd301eba422e82e4e47b31f6404959e6444e4a56..e571846fc195819f6116b581e325adf9e5788dd2 100644 (file)
@@ -1,9 +1,7 @@
-# Automatically generated from ./bin/Makefile.am.wild by autowild
-# Do not edit
 # 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 clien.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 meek.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in
+# 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
 
 SLANG_SCHRIFTEN = flower.py lilypython.py
 PAREL_SCHRIFTEN = 
@@ -13,4 +11,4 @@ EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFT
 clean-local:
        -rm -f flower.pyc
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index f508a310f65973204260f842187268d4e3e38321..92f8b1ccfa4989a80cec7ac05b1ea4256c1d2463 100644 (file)
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./bin/Makefile.am.wild by autowild
-# Do not edit
 # 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 clien.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 meek.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in
+# 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
 
 
 SHELL = /bin/sh
@@ -64,14 +62,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -79,6 +78,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -93,6 +93,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -106,7 +107,7 @@ PAREL_SCHRIFTEN =
 IN_SCHRIFTEN = flower.py lilypython.py
 EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES =  add-URLs clean-diaper clean-embeds clean-fonts \
 conflily convert-mudela cvm find-typenames foo genheader ly2dvi \
 make-docxx make-examples make-patch make-version make-website mf-deps \
@@ -249,7 +250,7 @@ mostlyclean distclean maintainer-clean
 clean-local:
        -rm -f flower.pyc
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index e2e5638735c9ab37123482ddbc6b2f26e3573574..0371058399e75d36a7004b8c0b65ad53b832d10c 100755 (executable)
@@ -17,7 +17,7 @@ for i in $WILD_MAKEFILES; do
        dir=$(dirname $i)
        wild=$(basename $i)
        make=$(basename $i .wild)
-       TOPDIR=`pwd`
+       TOPDIR=${LILYPOND_SOURCEDIR-`pwd`}
        (cd $dir
 
        $verbose -n "trying $dir/$make.. "
index f175c175866afcdf9ca2f880b6f3091d10bdad87..3b42fc3ebc11dfa98266e8df88caae829aa4cb05 100755 (executable)
@@ -32,5 +32,7 @@ if [ "x$LILYINCLUDE" = "x" ]; then
        echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf"
 fi
 
-configure --prefix=/usr --enable-debugging --enable-printing --enable-checking
+mkdir -f ../build
+(cd ../build; 
+../current/configure --prefix=/usr --enable-debugging --enable-printing --enable-checking)
 
index 19b8c26db2e3908ab8443b64b229c21e7f4108aa..4375c69d3e0932ee2b70322b5613b3e64bafd6a5 100755 (executable)
@@ -19,8 +19,6 @@ import os
 import getopt
 
 
-
-
 version_re = regex.compile('\\version *\"\(.*\)\"')
 # now used as shell script in configure too!
 # make_assign_re = regex.compile('^\([A-Z_]*\) *= *\(.*\)$')
@@ -56,13 +54,17 @@ def next_version(tup):
 def prev_version(tup):
     t = tup
     if t[3]:
-       return (tup[0], tup[1], tup[2], '');
+       t3name = regsub.sub('[0-9]*$', '', t[3])
+       t3level = atoi(regsub.sub('[^0-9]*', '', t[3]))
+       if t3level and t3level - 1 > 0:
+           return (tup[0], tup[1], tup[2], t3name + `t3level - 1`); 
+        else:
+           return (tup[0], tup[1], tup[2], '');
     elif t[2] == 0 :
        return (tup[0], tup[1] -1, tup[2], ''); 
     else:      
        return (tup[0], tup[1], tup[2] - 1, '');
 
-
 def dirname(v):
     return 'lilypond-' + version_tuple_to_str(v)
 
@@ -72,7 +74,6 @@ def tarball(v):
 def released_tarball(v):
     return lilydirs.release_dir + tarball(v)
 
-
 def tuple_to_list(tup):
     l=[]
     for x in tup:
@@ -88,8 +89,6 @@ def version_str_to_tuple(str):
        
     return (atoi(t[0]), atoi(t[1]), atoi(t[2]), mypatch)
 
-
-
 def guess_mudela_version(filename):
     f = open (filename)
     lines = f.readlines()
@@ -194,201 +193,3 @@ def read_mudela_header (fn):
 
     return dict
    
-       
-#!/usr/bin/python
-
-# 
-# lily-python.py --  implement general LilyPond-wide python stuff
-# 
-# source file of the GNU LilyPond music typesetter
-# 
-# (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-# 
-
-import posix
-import pwd
-import regex
-import regsub
-from string import *
-from flower import *
-import sys
-import os
-import getopt
-
-
-
-
-version_re = regex.compile('\\version *\"\(.*\)\"')
-# now used as shell script in configure too!
-# make_assign_re = regex.compile('^\([A-Z_]*\) *= *\(.*\)$')
-make_assign_re = regex.compile('^\([A-Z_]*\)=\(.*\)$')
-
-def version_tuple(file):
-    lines = file.readlines()
-
-    mi = pa = mj = 0
-    mp = ''
-    
-    for l in lines:
-       if make_assign_re.search(l) <> -1:
-           nm = make_assign_re.group(1)
-           val = make_assign_re.group(2)
-#          if nm == 'TOPLEVEL_MAJOR_VERSION':
-           if nm == 'MAJOR_VERSION':
-               mj = atoi(val)
-#          elif nm == 'TOPLEVEL_MINOR_VERSION':
-           elif nm == 'MINOR_VERSION':
-               mi = atoi(val)
-#          elif nm == 'TOPLEVEL_PATCH_LEVEL':
-           elif nm == 'PATCH_LEVEL':
-               pa = atoi(val)
-#          elif nm == 'TOPLEVEL_MY_PATCH_LEVEL':
-           elif nm == 'MY_PATCH_LEVEL':
-               mp = val
-    return (mj,mi,pa,mp)
-
-def next_version(tup):
-    return (tup[0], tup[1], tup[2] + 1, tup[3]);
-
-def prev_version(tup):
-    t = tup
-    if t[3]:
-       return (tup[0], tup[1], tup[2], '');
-    elif t[2] == 0 :
-       return (tup[0], tup[1] -1, tup[2], ''); 
-    else:      
-       return (tup[0], tup[1], tup[2] - 1, '');
-
-
-def dirname(v):
-    return 'lilypond-' + version_tuple_to_str(v)
-
-def tarball(v):
-    return dirname(v)  + '.tar.gz'
-
-def released_tarball(v):
-    return lilydirs.release_dir + tarball(v)
-
-
-def tuple_to_list(tup):
-    l=[]
-    for x in tup:
-       l.append[x]
-    return l
-
-def version_str_to_tuple(str):
-    t = split(str, '.')
-    try:
-       mypatch = t[3]
-    except IndexError:
-       mypatch = ''
-       
-    return (atoi(t[0]), atoi(t[1]), atoi(t[2]), mypatch)
-
-
-
-def guess_mudela_version(filename):
-    f = open (filename)
-    lines = f.readlines()
-    f.close()
-    for l in lines:
-       if version_re.search(l) <> -1:
-           return version_re.group(1)
-    
-    return ''
-
-def version_tuple_to_str(tup):
-    mypatch =''
-    if tup[3]:
-       mypatch = '.' + tup[3]
-    
-    return ('%d.%d.%d' % tup[0:3]) + mypatch
-
-class Lilydirs:
-    def __init__(self):
-       try:
-           self.topdir = os.environ['LILYPOND_SOURCEDIR'] + '/'
-       
-       except KeyError:
-           print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/'
-           sys.exit(1)
-           
-       try:
-           self.groupdir = os.environ['LILYPOND_GROUPDIR'] + '/'
-       except KeyError:
-           self.groupdir = self.topdir + '../'
-       self.release_dir = self.groupdir + '/releases/'
-       self.patch_dir = self.groupdir + '/patches/'
-
-    def version_tuple(self):
-        f = open (self.topdir + 'VERSION')
-       v = version_tuple(f)
-       f.close ()
-       return v
-
-
-
-lilydirs = Lilydirs()
-
-if __name__ == '__main__':
-    v= lilydirs.version_tuple()
-    print v, prev_version(v), next_version(v)
-    mv =  guess_mudela_version(lilydirs.topdir + 'init/symbol.ly')
-    pv=(0,1,1,'jcn4')
-    print version_tuple_to_str(pv), prev_version(pv), next_version(pv)
-    print version_tuple_to_str((0,1,1,''))    
-    print mv, version_str_to_tuple(mv)
-
-
-    
-def dump_file(f, s):
-    i = open(f, 'w')
-    i.write(s)
-    i.close ()
-
-def gulp_file(f):
-    i = open(f)
-    i.seek (0, 2)
-    len = i.tell ()
-    i.seek (0,0)
-    return i.read (len)
-
-
-header_regex = regex.compile('\\header[ \t\n]*{\([^}]*\)}')
-header_entry_regex = regex.compile('[\n\t ]*\([^\n\t ]+\)[\n\t ]*=[\n \t]*\([^;]+\)[\n \t]*;')
-
-#
-# FIXME breaks on multiple strings.
-#
-def read_mudela_header (fn):
-    s = gulp_file(fn)
-    s = regsub.gsub('%.*$', '', s)
-    s = regsub.gsub('\n', ' ', s)    
-
-    dict = {}
-    if header_regex.search(s) <> -1:
-       h = header_regex.group(1)
-    else:
-       return dict
-
-    while regex.search('=', h) <> -1: 
-
-       if header_entry_regex.search (h) == -1:
-
-           raise 'format error'
-
-       h = regsub.sub(header_entry_regex, '', h)
-       left = header_entry_regex.group(1)
-       right = header_entry_regex.group(2)
-
-       right = regsub.gsub('\([^\\]\)\"', '\\1', right)
-       right = regsub.gsub('^"', '', right)    
-       left = regsub.gsub('\([^\\]\)\"', '', left)
-       left = regsub.gsub('^"', '', left)
-
-       dict[left] = right
-
-    return dict
-   
-       
index 5d052f95f7c0a05e749686b9cf8cea1f0bc9339c..a2cbd77e7d6c7ec856306cc9b9a56527d16c94a1 100755 (executable)
@@ -19,7 +19,7 @@ import getopt
 import pipes
 
 
-mp_version = '0.3'
+mp_version = '0.5'
 
 class Options:
     def __init__(self):
@@ -34,7 +34,7 @@ def help():
        'Generate a patch to go to this version.\n'
        '  --from=FROM, -f FROM    old is FROM\n'
        '  --to=TO, -t TO          to version TO\n'  
-       
+       '  --dir=DIR, -d TO        directory\n'  
        )
 
 
@@ -42,15 +42,7 @@ def help():
 def untar(fn):
     # os.system('pwd');
     sys.stderr.write('untarring ' + fn + '\n')
-# can't seem to fix errors:
-# gzip: stdout: Broken pipe
-# tar: Child returned status 1
-#   os.system ('tar xzf ' + fn)
-#   sys.stderr.write('\n')
-# ugh, even this does not work, but one error message less :-)
     os.system ('gzip --quiet -dc ' + fn + '| tar xf - ')
-# so print soothing message:
-#    sys.stderr.write('make-patch:ugh: Please ignore error: gzip: stdout: Broken pipe\n');
     sys.stderr.flush()
 
 
@@ -63,7 +55,9 @@ usage \n\
 Patches do not contain automatically generated files, \n\
 i.e. you should rerun configure\n\n'
 
-pats = ['*.lsm', 'configure', '*.txt', 'lilypond.spec', 'Makefile.am', 'Makefile.in', 'lexer.cc', 'parser.cc']
+# ugh, how to get rid of .tex files generated by lily?
+pats = ['core', '*.lsm', 'configure', '*.P', '*.txt', 'feta[0-9][0-9]*.ly', 'feta[0-9][0-9]*.tex', '*.orig', '*.rej', '*bla*', 'x', '*.dvi', '*.aux', '*.log', '*.ps', '*.gif', '*.midi', 'lilypond.spec', 'Makefile.am', 'Makefile.in', 'lexer.cc', 'parser.cc', 'patch-*']
+
 def remove_automatic(dirnames):
     files = []
     files = files + multiple_find(pats, dirnames)
@@ -71,53 +65,44 @@ def remove_automatic(dirnames):
     for f in files:
        os.remove(f)
 
-def makepatch(fv, tv, patfile_nm):
-    import tempfile
-    prev_cwd = os.getcwd();
-    try:
-       os.mkdir ('/tmp/make-patch');
-    except:
-       pass
-       
-    os.chdir ('/tmp/make-patch');
-    untar(released_tarball(fv))
-    untar(released_tarball(tv))
-    remove_automatic([dirname(fv), dirname(tv)])
+def makepatch(fromdir, todir, patfile_nm):
 
-    os.chdir(dirname(tv))
-    
-    if not patfile_nm:
-       patfile_nm = '../patch-%s' % version_tuple_to_str(tv)
+    remove_automatic([fromdir, todir])
 
+    os.chdir(todir)
+    
     f = open(patfile_nm, 'w')
     f.write(header %\
-           (version_tuple_to_str(fv), version_tuple_to_str(tv), \
+           (fromdir, todir, \
             os.path.basename(patfile_nm)))
     f.close()
            
     sys.stderr.write('diffing to %s... ' % patfile_nm)
-    os.system('diff -urN ../%s . >> %s' % (dirname(fv), patfile_nm))
-    #os.system('gzip -9f %s' % patfile_nm)
-    os.chdir('/tmp/make-patch')
-
-    sys.stderr.write('cleaning ... ')
-    os.system('rm -fr %s %s' % (dirname(tv), dirname(fv)))
-    sys.stderr.write('\n')
-    os.chdir(prev_cwd)
-    
+    os.system('pwd')
+    print ('diff -urN ../%s . >> %s' % (fromdir, patfile_nm))
+    os.system('diff -urN ../%s . >> %s' % (fromdir, patfile_nm))
+    os.system('gzip -9f %s' % patfile_nm)
+   
 def main():
     os.environ['GZIP'] = '-q'
     sys.stderr.write('This is make-patch version %s\n' % mp_version)
     (cl_options, files) = getopt.getopt(sys.argv[1:], 
                                        'hf:o:t:', ['output=', 'help', 'from=', 'to='])
     outfn = ''
+    srcdir = './'
+    from_b=0
+    to_b=0
     for opt in cl_options:
        o = opt[0]
        a = opt[1]
        if o == '--from' or o == '-f':
             options.from_version = version_str_to_tuple(a)
+            from_b=1
        elif o == '--to' or o == '-t':
-           options.to_version = version_str_to_tuple(a)
+            options.to_version = version_str_to_tuple(a)
+            to_b=1
+       elif o == '--dir' or o == '-d':
+           srcdir = a;
        elif o== '--help' or o == '-h':
            help()
            return 0;
@@ -130,7 +115,54 @@ def main():
        pn = 'patch-%s' % version_tuple_to_str(options.to_version)
        outfn =  os.path.join(os.getcwd(), pn)
 
-    makepatch(options.from_version, options.to_version, outfn)
+    import tempfile
+    prev_cwd = os.getcwd();
+
+    os.system('rm -rf /tmp/make-patch')
+    try:
+       os.mkdir ('/tmp/make-patch')
+    except:
+       pass
+       
+    fromdir = dirname(options.from_version)
+    todir =  dirname(options.to_version)
+
+    diffdir = ''
+    # always true, for now
+    if srcdir != '':
+           diffdir = '/tmp/make-patch/' + 'lilypond-%s'\
+               % version_tuple_to_str(options.to_version)
+
+    if from_b != 0 or (from_b == 0 and to_b == 0):
+       os.chdir ('/tmp/make-patch')
+       untar(released_tarball(options.from_version))
+       os.chdir(prev_cwd)
+    else:
+       fromdir = diffdir
+       sys.stderr.write('copying ' + srcdir + ' to ' + diffdir + '\n')
+       os.system('cp -pr %s %s' % (srcdir, diffdir))
+
+    if to_b != 0:
+       os.chdir ('/tmp/make-patch')
+       untar(released_tarball(options.to_version))
+       os.chdir(prev_cwd)
+    else:
+       todir = diffdir
+       sys.stderr.write('copying ' + srcdir + ' to ' + diffdir + '\n')
+       os.system('cp -pr %s %s' % (srcdir, diffdir))
+
+    os.chdir(diffdir)
+    os.system('rm -f *.aux *.dvi *.midi *.log *.ps *.tex *.ly')
+    os.chdir ('/tmp/make-patch')
+
+    makepatch(fromdir, todir, outfn) 
+
+    os.chdir('/tmp/make-patch')
+    sys.stderr.write('cleaning ... ')
+    os.system('rm -fr %s %s' % (fromdir, todir))
+    sys.stderr.write('\n')
+    os.chdir(prev_cwd)
 
 if __name__ == '__main__':
     main()
+
index a61caf335bfeddb78644f26010c29acc01925fae..ede94c23fc5c85db16b38a933bdcc9cfead0e441 100755 (executable)
@@ -4,7 +4,7 @@
 use Getopt::Long;
 GetOptions("top-srcdir:s");
 
-$my_topdir = $opt_top_srcdir ? $opt_top_srcdir : "\$(top_srcdir)";
+$my_topsrcdir = $opt_top_srcdir ? $opt_top_srcdir : "\$(top_srcdir)";
 
 @ignorestuff = ();
 
@@ -25,6 +25,7 @@ while (<>) {
            foreach $i (@ignorelist) {
                print "# ignoring wildcards for \`$i\'\n";
                push @ignorestuff, $i; # concat ? uh?
+               print "IGNORE_WILDCARDS=$ignore";
            }
 
            
@@ -43,5 +44,6 @@ while (<>) {
 
 
 print "\$(srcdir)/Makefile.am: \$(srcdir)/Makefile.am.wild\n" .
-    "\t\$(PERL) $my_topdir/bin/wild-perl --top-srcdir=\"\$(real_topdir)\" < \$< > \$@";
+#    "\t\$(PERL) $my_topsrcdir/bin/wild-perl --top-srcdir=\"\$(real_topsrcdir)\" < \$< > \$@";
+    "\t\$(PERL) $my_topsrcdir/bin/wild-perl < \$< > \$@";
 
index ba57f5ead259e1f901a66970197459cd6c70c938..5f455e0ff775e7c95140f914ab836c0ca9899615 100644 (file)
@@ -20,3 +20,6 @@
 
 /* the toplevel version string */
 #define TOPLEVEL_VERSION "0"
+
+/* the version string of the flower lib */
+#define FLOWER_VERSION "0"
index 059b3a65ad052416487d5726ed7d3f87d37a0860..84a85a5bc82114fb496d384b8001e9c94d7aeb33 100755 (executable)
--- a/configure
+++ b/configure
@@ -634,8 +634,24 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
+
+PACKAGE=lilypond
+
+VERSION=$FULL_VERSION
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:639: checking whether build environment is sane" >&5
+echo "configure:655: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -646,21 +662,10 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
+   if test "" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
    test "$2" = conftestfile
    )
 then
@@ -691,54 +696,9 @@ test "$program_suffix" != NONE &&
 # sed with no file args requires a program.
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:696: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-       @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=lilypond
-
-VERSION=$FULL_VERSION
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:742: checking for working aclocal" >&5
+echo "configure:702: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -751,7 +711,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:755: checking for working autoconf" >&5
+echo "configure:715: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -764,7 +724,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:768: checking for working automake" >&5
+echo "configure:728: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -777,7 +737,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:781: checking for working autoheader" >&5
+echo "configure:741: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -790,7 +750,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:794: checking for working makeinfo" >&5
+echo "configure:754: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -802,10 +762,50 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:767: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+       @echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+. $srcdir/flower/VERSION
+FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+
+# libtool.info ...
+# **Never** try to set library version numbers so that they correspond
+# to the release number of your package.  This is an abuse that only
+# fosters misunderstanding of the purpose of library versions.
+
+REVISION=$PATCH_LEVEL
+# CURRENT=$MINOR_VERSION
+CURRENT=`expr $MINOR_VERSION + 1`
+# AGE=$(expr $MAJOR_VERSION + 1)
+AGE=$MAJOR_VERSION
+
 
 
-#AC_PROG_CC
-#AC_PROG_CXX
 
 # turn off shared libraries by default (may be enabled using --enable-shared)
 # Check whether --enable-shared or --disable-shared was given.
@@ -1612,14 +1612,13 @@ EOF
 fi
 
 if test "$optimise_b" = yes; then
-#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
     cat >> confdefs.h <<\EOF
 #define STRINGS_UTILS_INLINED 1
 EOF
 
 fi
 
-# oeps, broken for now
 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"
@@ -1645,14 +1644,16 @@ fi
 
 AUTOGENERATE="This file was automatically generated by configure"
 CPPFLAGS=${CPPFLAGS:-""}       # we don't want -g -O junk
-CXXFLAGS=${CXXFLAGS:-""}       # we don't want -g -O junk
+# CXXFLAGS=${CXXFLAGS:-""}     # we don't want -g -O junk
+CXXFLAGS=$DEFINES
+LDFLAGS=$EXTRA_LIBES
 
 for ac_prog in $CCC c++ g++ gcc CC cxx cc++
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1656: checking for $ac_word" >&5
+echo "configure:1657: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1683,7 +1684,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1687: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1688: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1693,11 +1694,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1697 "configure"
+#line 1698 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1717,12 +1718,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1721: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1722: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1726: checking whether we are using GNU C++" >&5
+echo "configure:1727: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1731,7 +1732,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1746,7 +1747,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1750: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1751: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1785,7 +1786,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1789: checking for a BSD compatible install" >&5
+echo "configure:1790: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1839,7 +1840,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1843: checking for $ac_word" >&5
+echo "configure:1844: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1873,7 +1874,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1877: checking for $ac_word" >&5
+echo "configure:1878: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1918,6 +1919,10 @@ cat >> confdefs.h <<EOF
 #define TOPLEVEL_VERSION "${FULL_VERSION}"
 EOF
 
+cat >> confdefs.h <<EOF
+#define FLOWER_VERSION "${FULL_FLOWER_VERSION}"
+EOF
+
 # ugh: produces "${prefix}/share/lilypond"
 # DIR_DATADIR=$datadir/lilypond
 # ugh: produces "NONE/share/lilypond"
@@ -1940,6 +1945,7 @@ absolute_builddir="`pwd`"
 
 
 
+# AC_SUBST(DEFINES)
 
 
 
@@ -1960,7 +1966,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1964: checking for $ac_word" >&5
+echo "configure:1970: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1994,7 +2000,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1998: checking for $ac_word" >&5
+echo "configure:2004: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2028,7 +2034,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2032: checking for $ac_word" >&5
+echo "configure:2038: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2060,7 +2066,7 @@ test -n "$MAKE" || MAKE="error"
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2064: checking for $ac_word" >&5
+echo "configure:2070: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2092,7 +2098,7 @@ fi
 # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2096: checking for $ac_word" >&5
+echo "configure:2102: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2126,7 +2132,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_word" >&5
+echo "configure:2136: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2160,7 +2166,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2164: checking for $ac_word" >&5
+echo "configure:2170: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2196,7 +2202,7 @@ if test "x$TEXPREFIX" = xauto ; then
     
 
     echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6
-echo "configure:2200: checking TeX/MF root dir directory" >&5    
+echo "configure:2206: checking TeX/MF root dir directory" >&5    
 
     find_root_prefix="$prefix"
     
@@ -2237,7 +2243,7 @@ if test "x$MFDIR" = xauto; then
     
     
     echo $ac_n "checking MF input directory""... $ac_c" 1>&6
-echo "configure:2241: checking MF input directory" >&5    
+echo "configure:2247: checking MF input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')`
     
@@ -2262,7 +2268,7 @@ if test "x$TEXDIR" = xauto ; then
     
     
     echo $ac_n "checking TeX input directory""... $ac_c" 1>&6
-echo "configure:2266: checking TeX input directory" >&5    
+echo "configure:2272: checking TeX input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')`
     
@@ -2378,7 +2384,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2382: checking how to run the C++ preprocessor" >&5
+echo "configure:2388: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2391,12 +2397,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 2395 "configure"
+#line 2401 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -2416,17 +2422,17 @@ echo "$ac_t""$CXXCPP" 1>&6
 
 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
-echo "configure:2420: checking for FlexLexer.h" >&5
+echo "configure:2426: checking for FlexLexer.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2425 "configure"
+#line 2431 "configure"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2452,11 +2458,7 @@ else
 fi
 
 
-subdirs="flower"
-
-
-touch lib/stamp-h.in
-# AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in)
+touch stamp-h.in
 
 
 
@@ -2563,16 +2565,18 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile
-       lily/include/Makefile mf/Makefile mi2mu/Makefile
+trap 'rm -fr `echo "bin/Makefile flower/Makefile flower/include/Makefile
+       flowertest/Makefile lib/Makefile lib/include/Makefile 
+       lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
        mi2mu/include/Makefile debian/Makefile Documentation/Makefile
        init/Makefile input/Makefile tex/Makefile make/Makefile
-       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile bin/add-URLs
-       bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily
-       bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader
-       bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch
-       bin/make-version bin/make-website bin/mf-deps bin/mf-to-table
-       bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest lib/config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile 
+       bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
+       bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
+       bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
+       bin/make-patch bin/make-version bin/make-website bin/mf-deps 
+       bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
+       bin/show-latest flower/config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2613,6 +2617,9 @@ s%@AUTOMAKE@%$AUTOMAKE%g
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
+s%@CURRENT@%$CURRENT%g
+s%@REVISION@%$REVISION%g
+s%@AGE@%$AGE%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
@@ -2634,7 +2641,6 @@ s%@TAR@%$TAR%g
 s%@FIND@%$FIND%g
 s%@ICFLAGS@%$ICFLAGS%g
 s%@ILDFLAGS@%$ILDFLAGS%g
-s%@DEFINES@%$DEFINES%g
 s%@COMPILEINFO@%$COMPILEINFO%g
 s%@AUTOGENERATE@%$AUTOGENERATE%g
 s%@BISON@%$BISON%g
@@ -2653,7 +2659,6 @@ s%@MAKE@%$MAKE%g
 s%@POD2HTML@%$POD2HTML%g
 s%@POD2MAN@%$POD2MAN%g
 s%@CXXCPP@%$CXXCPP%g
-s%@subdirs@%$subdirs%g
 
 CEOF
 EOF
@@ -2695,16 +2700,18 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile
-       lily/include/Makefile mf/Makefile mi2mu/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"bin/Makefile flower/Makefile flower/include/Makefile
+       flowertest/Makefile lib/Makefile lib/include/Makefile 
+       lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
        mi2mu/include/Makefile debian/Makefile Documentation/Makefile
        init/Makefile input/Makefile tex/Makefile make/Makefile
-       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile bin/add-URLs
-       bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily
-       bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader
-       bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch
-       bin/make-version bin/make-website bin/mf-deps bin/mf-to-table
-       bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest"}
+       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile 
+       bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
+       bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
+       bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
+       bin/make-patch bin/make-version bin/make-website bin/mf-deps 
+       bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
+       bin/show-latest"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2785,7 +2792,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="lib/config.hh:config.hh.in"
+  CONFIG_HEADERS="flower/config.hh:config.hh.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -2876,7 +2883,7 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > lib/stamp-h
+test -z "$CONFIG_HEADERS" || echo timestamp > flower/stamp-h
 
 exit 0
 EOF
@@ -2884,103 +2891,6 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in flower; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
 
 # ugh
 chmod 755 bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest
index 31f666073c1d77e4ffbab79db1a4a443011f6d2d..5a1c64b911e1a0a4222ebd741c6061d798229457 100644 (file)
@@ -11,8 +11,22 @@ if test x$MY_PATCH_LEVEL != x; then
 fi
 AM_INIT_AUTOMAKE(lilypond, $FULL_VERSION)
 
-#AC_PROG_CC
-#AC_PROG_CXX
+. $srcdir/flower/VERSION
+FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+
+# libtool.info ...
+# **Never** try to set library version numbers so that they correspond
+# to the release number of your package.  This is an abuse that only
+# fosters misunderstanding of the purpose of library versions.
+
+REVISION=$PATCH_LEVEL
+# CURRENT=$MINOR_VERSION
+CURRENT=`expr $MINOR_VERSION + 1`
+# AGE=$(expr $MAJOR_VERSION + 1)
+AGE=$MAJOR_VERSION
+AC_SUBST(CURRENT)
+AC_SUBST(REVISION)
+AC_SUBST(AGE)
 
 # turn off shared libraries by default (may be enabled using --enable-shared)
 AM_DISABLE_SHARED
@@ -86,11 +100,10 @@ if test "$checking_b" = no; then
 fi
 
 if test "$optimise_b" = yes; then
-#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
-# oeps, broken for now
 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"
@@ -117,7 +130,9 @@ fi
 dnl COMPILEINFO="$HOST $host $TARGET $target"
 AUTOGENERATE="This file was automatically generated by configure"
 CPPFLAGS=${CPPFLAGS:-""}       # we don't want -g -O junk
-CXXFLAGS=${CXXFLAGS:-""}       # we don't want -g -O junk
+# CXXFLAGS=${CXXFLAGS:-""}     # we don't want -g -O junk
+CXXFLAGS=$DEFINES
+LDFLAGS=$EXTRA_LIBES
 
 AC_PROG_CXX
 # AC_PROG_RANLIB
@@ -130,6 +145,7 @@ AC_CHECK_SEARCH_RESULT($FIND, \`find\'. Please use --enable-tex-dir)
 
 
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 # ugh: produces "${prefix}/share/lilypond"
 # DIR_DATADIR=$datadir/lilypond
 # ugh: produces "NONE/share/lilypond"
@@ -145,10 +161,11 @@ absolute_builddir="`pwd`"
     
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 AC_SUBST(CXX)
 AC_SUBST(ICFLAGS)
 AC_SUBST(ILDFLAGS)
-AC_SUBST(DEFINES)
+AC_SUBST(DEFINES)
 AC_SUBST(COMPILEINFO)
 AC_SUBST(AUTOGENERATE)
 AC_SUBST(BISON)
@@ -230,23 +247,22 @@ fi
 AC_CHECK_HEADER(FlexLexer.h, true,
        AC_LILY_WARN(can't find flex header. Please install Flex headers correctly))
 
-AC_CONFIG_SUBDIRS(flower)
-
-touch lib/stamp-h.in
-# AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in)
-AM_CONFIG_HEADER(lib/config.hh:config.hh.in)
+touch stamp-h.in
+AM_CONFIG_HEADER(flower/config.hh:config.hh.in)
 
 # first do Foobar/Makefile then Foobar/include/Makefile
-AC_OUTPUT(bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile
-       lily/include/Makefile mf/Makefile mi2mu/Makefile
+AC_OUTPUT(bin/Makefile flower/Makefile flower/include/Makefile
+       flowertest/Makefile lib/Makefile lib/include/Makefile 
+       lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
        mi2mu/include/Makefile debian/Makefile Documentation/Makefile
        init/Makefile input/Makefile tex/Makefile make/Makefile
-       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile bin/add-URLs
-       bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily
-       bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader
-       bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch
-       bin/make-version bin/make-website bin/mf-deps bin/mf-to-table
-       bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest)
+       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile 
+       bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
+       bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
+       bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
+       bin/make-patch bin/make-version bin/make-website bin/mf-deps 
+       bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
+       bin/show-latest)
 
 # ugh
 chmod 755 bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest
index 12b5972e215f8d3f1fb849a9c2bfdf7b874c82c2..8942bdb91e5f2f08edb060a76f56a44d64ce538d 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./debian/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # debian/Makefile.am.wild
 
@@ -7,4 +5,4 @@ EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
        postinst postinst.old.sh postrm preinst rules watch
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 8eefa73d57283b0ec03db9b5fdbe44ef853fd012..28668c8eb5bdf99ebb7d8789d0288b297527d276 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./debian/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # debian/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -102,7 +103,7 @@ absolute_builddir = @absolute_builddir@
 EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
        postinst postinst.old.sh postrm preinst rules watch
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in TODO
 
@@ -191,7 +192,7 @@ mostlyclean distclean maintainer-clean
 
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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/AUTHORS b/flower/AUTHORS
deleted file mode 100644 (file)
index 9d9d19a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-see ../AUTHORS
diff --git a/flower/COPYING b/flower/COPYING
deleted file mode 100644 (file)
index a2a0122..0000000
+++ /dev/null
@@ -1 +0,0 @@
-see ../COPYING
diff --git a/flower/ChangeLog b/flower/ChangeLog
deleted file mode 100644 (file)
index e1b28ea..0000000
+++ /dev/null
@@ -1 +0,0 @@
-oeps: no more details than NEWS
diff --git a/flower/GNUmakefile b/flower/GNUmakefile
new file mode 100644 (file)
index 0000000..d347f6b
--- /dev/null
@@ -0,0 +1,54 @@
+# flower/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+biltdir=../../build/flower
+
+make-in-build: wild-check
+       exec $(MAKE) -C $(biltdir)
+
+# include Makefile
+include $(biltdir)/Makefile
+
+clean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+dist: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+distclean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+endif
+
+# Makefile.am.wild: libflower_la_SOURCES = $(wildcard *.cc)
+CURRENT_libflower_la_SOURCES = $(wildcard *.cc)
+
+wild-check: check-flower-la-sources
+
+check-flower-la-sources:
+ifneq ($(libflower_la_SOURCES),$(CURRENT_libflower_la_SOURCES))
+       @echo \"$(libflower_la_SOURCES)\"
+       @echo \"$(CURRENT_libflower_la_SOURCES)\"
+       @echo  libflower_la_SOURCES changed: rerunning make-wild.
+       @-rm -f Makefile.am
+        $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
diff --git a/flower/INSTALL b/flower/INSTALL
deleted file mode 100644 (file)
index 28d72f9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-see ../INSTALL
index 5eeaa35c32e4e513adad5b3cba2cc21a2ad1bed0..99167e4bc6e75edc289b1e729425b552024287c2 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./flower/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  FlowerSoft C++ library
 # title           top level makefile for FlowerLib
 #      Han-Wen Nienhuys <hanwen@stack.nl>
 #              ...your sort order here, or how to comment-out a comment
 
-SUBDIRS = include test 
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
+SUBDIRS = include
 
 lib_LTLIBRARIES = libflower.la
 
 README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(README_FILES)
+EXTRA_DIST = Makefile.am.wild GNUmakefile $(README_FILES)
 
 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 = -I$(srcdir)/include
+INCLUDES = -I$(top_srcdir)/flower/include
 
 distclean-local:
        -rm -rf .deps
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 6ef3498d049fc9f5c0c7713a267c5797ef7eb700..869fb332b59718cf8551f1ec1f0c4e03bbbda4cb 100644 (file)
@@ -7,21 +7,28 @@
 #      Han-Wen Nienhuys <hanwen@stack.nl>
 #              ...your sort order here, or how to comment-out a comment
 
-SUBDIRS = include test 
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
+SUBDIRS = include
 
 lib_LTLIBRARIES = libflower.la
 
 README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(README_FILES)
+EXTRA_DIST = Makefile.am.wild GNUmakefile $(README_FILES)
 
 libflower_la_SOURCES = $(wildcard *.cc)
 
 libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
 
-INCLUDES = -I$(srcdir)/include
+INCLUDES = -I$(top_srcdir)/flower/include
 
 distclean-local:
        -rm -rf .deps
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
+
index 0a620aad4db32e54a3f81c27174e38552ae9ae07..29b3f2f617cbc49d9727298040fec4c597ce728f 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./flower/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  FlowerSoft C++ library
 # title           top level makefile for FlowerLib
@@ -48,7 +46,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = .
+top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -70,48 +68,64 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AGE = @AGE@
+AUTOGENERATE = @AUTOGENERATE@
+BISON = @BISON@
 CC = @CC@
+COMPILEINFO = @COMPILEINFO@
+CPPFLAGS = @CPPFLAGS@
 CURRENT = @CURRENT@
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+DIR_DATADIR = @DIR_DATADIR@
+EXTRA_LIBES = @EXTRA_LIBES@
+FIND = @FIND@
+FLEX = @FLEX@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
 LIBTOOL = @LIBTOOL@
-LIB_SUFFIX = @LIB_SUFFIX@
+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@
 REVISION = @REVISION@
+TAR = @TAR@
+TEXDIR = @TEXDIR@
+TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
+YACC = @YACC@
+ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
-SUBDIRS = include test 
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
+SUBDIRS = include
 
 lib_LTLIBRARIES = libflower.la
 
 README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(README_FILES)
+EXTRA_DIST = Makefile.am.wild GNUmakefile $(README_FILES)
 
 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 = -I$(srcdir)/include
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+INCLUDES = -I$(top_srcdir)/flower/include
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.hh
 CONFIG_CLEAN_FILES = 
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libflower_la_LIBADD = 
 libflower_la_OBJECTS =  choleski.lo cpu-timer.lo data-file.lo \
@@ -121,18 +135,14 @@ 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)
 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 acconfig.h aclocal.m4 config.hh.in configure \
-configure.in missing mkinstalldirs stamp-h.in
+DIST_COMMON =  README Makefile.am Makefile.in NEWS TODO
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP = --best
 SOURCES = $(libflower_la_SOURCES)
 OBJECTS = $(libflower_la_OBJECTS)
@@ -142,40 +152,12 @@ default: all
 .SUFFIXES:
 .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 Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flower/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        cd $(top_builddir) \
-         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-       cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure
-       $(SHELL) ./config.status --recheck
-$(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) acconfig.h
-       cd $(top_srcdir) && $(AUTOHEADER)
-       @echo timestamp > $(srcdir)/stamp-h.in
-
-mostlyclean-hdr:
-
-clean-hdr:
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-distclean-hdr:
-       -rm -f config.hh
-
-maintainer-clean-hdr:
 
 mostlyclean-libLTLIBRARIES:
 
@@ -290,7 +272,7 @@ 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) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -300,8 +282,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(L
        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)
+       test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -312,42 +294,11 @@ distclean-tags:
 
 maintainer-clean-tags:
 
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-       -rm -rf $(distdir)
-       GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
-       mkdir $(distdir)/=build
-       mkdir $(distdir)/=inst
-       dc_install_base=`cd $(distdir)/=inst && pwd`; \
-       cd $(distdir)/=build \
-         && ../configure --srcdir=.. --prefix=$$dc_install_base \
-         && $(MAKE) \
-         && $(MAKE) dvi \
-         && $(MAKE) check \
-         && $(MAKE) install \
-         && $(MAKE) installcheck \
-         && $(MAKE) dist
-       -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)
-dist-all: distdir
-       -chmod -R a+r $(distdir)
-       GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-       -rm -rf $(distdir)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = flower
+
 distdir: $(DISTFILES)
-       -rm -rf $(distdir)
-       mkdir $(distdir)
-       -chmod 777 $(distdir)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
@@ -359,113 +310,9 @@ distdir: $(DISTFILES)
          || mkdir $(distdir)/$$subdir \
          || exit 1; \
          chmod 777 $(distdir)/$$subdir; \
-         (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+         (cd $$subdir && $(MAKE) top_distdir=../$(top_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
-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
 
 info: info-recursive
 dvi: dvi-recursive
@@ -514,19 +361,18 @@ distclean-generic:
 maintainer-clean-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
+mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+               mostlyclean-libtool mostlyclean-tags \
+               mostlyclean-generic
 
-clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
-               clean-tags clean-generic mostlyclean-am
+clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
+               clean-generic mostlyclean-am
 
-distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
+distclean-am:  distclean-libLTLIBRARIES distclean-compile \
                distclean-libtool distclean-tags distclean-generic \
                clean-am
 
-maintainer-clean-am:  maintainer-clean-hdr \
-               maintainer-clean-libLTLIBRARIES \
+maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
                maintainer-clean-tags maintainer-clean-generic \
                distclean-am
@@ -542,16 +388,14 @@ distclean:  distclean-recursive distclean-am distclean-local
 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-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 \
+.PHONY: default 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 \
@@ -565,8 +409,18 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 distclean-local:
        -rm -rf .deps
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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/acconfig.h b/flower/acconfig.h
deleted file mode 100644 (file)
index 444f2a1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* autoheader really wants this */
-#define PACKAGE
-
-/* define if you have memmem */
-#define HAVE_MEMMEM 0
-
-/* define if you have snprintf */
-#define HAVE_SNPRINTF 0
-
-/* the version string of the flower lib */
-#define MODULE_VERSION "0.0.0"
-
-/* undef to get lots of debugging stuff (see .dstream) */
-#define NPRINT
-
-/* undef to do checking */
-#undef NDEBUG
-
-/* define to inline string funcs */
-#undef STRINGS_UTILS_INLINED
-
diff --git a/flower/aclocal.m4 b/flower/aclocal.m4
deleted file mode 100644 (file)
index bcae532..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2f
-
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-
-# serial 24 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-esac
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-])
-
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared         build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT]
-changequote([, ])dnl
-[  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
-
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static         build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT]
-changequote([, ])dnl
-[  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
-])
-
-
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | [A-Za-z]:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-       test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AM_PROG_LD_GNU
-])
-
-AC_DEFUN(AM_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[case "$NM" in
-/* | [A-Za-z]:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
-])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
diff --git a/flower/config.hh.in b/flower/config.hh.in
deleted file mode 100644 (file)
index ddd891d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* config.hh.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-
-/* autoheader really wants this */
-#define PACKAGE
-
-/* the version string of the flower lib */
-#define MODULE_VERSION "0.0.0"
-
-/* undef to get lots of debugging stuff (see .dstream) */
-#define NPRINT
-
-/* undef to do checking */
-#undef NDEBUG
-
-/* define to inline string funcs */
-#undef STRINGS_UTILS_INLINED
-
-/* Define if you have the memmem function.  */
-#undef HAVE_MEMMEM
-
-/* Define if you have the snprintf function.  */
-#undef HAVE_SNPRINTF
diff --git a/flower/configure b/flower/configure
deleted file mode 100755 (executable)
index c0082c9..0000000
+++ /dev/null
@@ -1,2125 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-shared         build shared libraries [default=no]
-  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list"
-ac_help="$ac_help
-  --enable-static         build static libraries [default=yes]
-  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  enable-printing         turn on debug printing. Default: off"
-ac_help="$ac_help
-  enable-checking         set runtime checks (assert calls). Default: on"
-ac_help="$ac_help
-  enable-optimise         use maximal speed optimisations. Default: off"
-ac_help="$ac_help
-  enable-profiling        compile with gprof support. Default: off"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"     "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=choleski.cc
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='       '
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-. $srcdir/VERSION
-FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
-if test x$MY_PATCH_LEVEL != x; then
-       FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
-fi
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:576: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-         if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           # OSF/1 installbsd also uses dspmsg, but is usable.
-           :
-         else
-           ac_cv_path_install="$ac_dir/$ac_prog -c"
-           break 2
-         fi
-       fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:629: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:686: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-       @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=flower
-
-VERSION=$FULL_VERSION
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:732: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:745: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:758: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:771: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:784: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:801: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:830: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-       continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 888 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:917: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:941: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:973: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$CXX" && break
-done
-test -n "$CXX" || CXX="gcc"
-
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1004: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 1014 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:1018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cxx_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1044: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1049: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
-else
-  ac_cv_prog_gxx=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
-  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS=
-  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1073: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
-else
-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-  if test "$ac_test_CXXFLAGS" = set; then
-    CXXFLAGS="$ac_save_CXXFLAGS"
-  elif test $ac_cv_prog_cxx_g = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-O2"
-  fi
-else
-  GXX=
-  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
-fi
-
-
-
-# turn off shared libraries by default (may be enabled using --enable-shared)
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=no
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-
-# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1156: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`$ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1179: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1218: checking for ld used by GCC" >&5
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | A-Za-z:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1236: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1239: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-       test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1275: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1291: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$NM" in
-/* | A-Za-z:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac
-fi
-
-NM="$ac_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1328: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 1364 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-esac
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-
-printing_b=no
-checking_b=yes
-optimise_b=no
-profile_b=no
-
-# Check whether --enable-printing or --disable-printing was given.
-if test "${enable_printing+set}" = set; then
-  enableval="$enable_printing"
-  printing_b=$enableval
-fi
-
-
-# Check whether --enable-checking or --disable-checking was given.
-if test "${enable_checking+set}" = set; then
-  enableval="$enable_checking"
-  checking_b=$enableval 
-fi
-
-
-# Check whether --enable-optimise or --disable-optimise was given.
-if test "${enable_optimise+set}" = set; then
-  enableval="$enable_optimise"
-  optimise_b=$enableval
-fi
-
-    
-# Check whether --enable-profiling or --disable-profiling was given.
-if test "${enable_profiling+set}" = set; then
-  enableval="$enable_profiling"
-  profile_b=$enableval
-fi
-
-    
-if test $printing_b = no; then
-    cat >> confdefs.h <<\EOF
-#define NPRINT 1
-EOF
-
-fi
-    
-if test $checking_b = no; then
-    cat >> confdefs.h <<\EOF
-#define NDEBUG 1
-EOF
-
-fi
-
-if test $optimise_b = yes; then
-#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
-    cat >> confdefs.h <<\EOF
-#define STRINGS_UTILS_INLINED 1
-EOF
-
-fi
-
-# oeps, broken for now
-if test $profile_b = yes; then
-    EXTRA_LIBES="-pg"
-    DEFINES="$DEFINES -pg"
-fi
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
-LIB_SUFFIX=.a
-MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT"
-
-
-
-
-
-# AC_SUBST(FULL_VERSION)
-# AC_SUBST(MAJOR_VERSION)
-# AC_SUBST(MINOR_VERSION)
-# AC_SUBST(PATCH_LEVEL)
-# AC_SUBST(MY_PATCH_LEVEL)
-
-# libtool.info ...
-# **Never** try to set library version numbers so that they correspond
-# to the release number of your package.  This is an abuse that only
-# fosters misunderstanding of the purpose of library versions.
-
-REVISION=$PATCH_LEVEL
-# CURRENT=$MINOR_VERSION
-CURRENT=`expr $MINOR_VERSION + 1`
-# AGE=$(expr $MAJOR_VERSION + 1)
-AGE=$MAJOR_VERSION
-
-
-
-
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1495: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PERL" in
-  /*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PERL="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="error"
-  ;;
-esac
-fi
-PERL="$ac_cv_path_PERL"
-if test -n "$PERL"; then
-  echo "$ac_t""$PERL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:1526: checking for 8-bit clean memcmp" >&5
-if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_memcmp_clean=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1534 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-main()
-{
-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
-}
-
-EOF
-if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_memcmp_clean=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_memcmp_clean=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
-test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
-
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1565: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1570 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vprintf(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char vprintf();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_vprintf) || defined (__stub___vprintf)
-choke me
-#else
-vprintf();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_vprintf=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_vprintf=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1620: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1625 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char _doprnt();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-for ac_func in memmem snprintf 
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1678: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1683 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-cat >> confdefs.h <<EOF
-#define MODULE_VERSION "${FULL_VERSION}"
-EOF
-
-
-touch stamp-h.in
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[        ]*VPATH[        ]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile include/Makefile test/Makefile config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@RANLIB@%$RANLIB%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@LN_S@%$LN_S%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@MODULE_CXXFLAGS@%$MODULE_CXXFLAGS%g
-s%@MODULE_LDFLAGS@%$MODULE_LDFLAGS%g
-s%@LIB_SUFFIX@%$LIB_SUFFIX%g
-s%@CURRENT@%$CURRENT%g
-s%@REVISION@%$REVISION%g
-s%@AGE@%$AGE%g
-s%@PERL@%$PERL%g
-s%@LIBOBJS@%$LIBOBJS%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile include/Makefile test/Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([  ]*\)#\([        ]*define[       ][      ]*\)'
-ac_dB='\([     ][      ]*\)[^  ]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([  ]*\)#\([        ]*\)undef\([    ][      ]*\)'
-ac_uB='\([     ]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([  ]*\)#\([        ]*\)undef\([    ][      ]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.hh:config.hh.in"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/flower/configure.in b/flower/configure.in
deleted file mode 100644 (file)
index aa9aa5f..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-dnl -*-shell-script-*-
-dnl Process this file with autoconf to produce a configure script.-
-
-AC_INIT(choleski.cc)
-
-. $srcdir/VERSION
-FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
-if test x$MY_PATCH_LEVEL != x; then
-       FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
-fi
-AM_INIT_AUTOMAKE(flower, $FULL_VERSION)
-
-AC_PROG_CC
-AC_PROG_CXX
-
-
-# turn off shared libraries by default (may be enabled using --enable-shared)
-AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
-
-printing_b=no
-checking_b=yes
-optimise_b=no
-profile_b=no
-
-AC_ARG_ENABLE(printing,
-    [  enable-printing         turn on debug printing. Default: off],
-    [printing_b=$enableval])
-
-AC_ARG_ENABLE(checking,
-    [  enable-checking         set runtime checks (assert calls). Default: on],
-    [checking_b=$enableval] )
-
-AC_ARG_ENABLE(optimise,
-    [  enable-optimise         use maximal speed optimisations. Default: off],
-    [optimise_b=$enableval])
-    
-AC_ARG_ENABLE(profiling, 
-    [  enable-profiling        compile with gprof support. Default: off],
-    [profile_b=$enableval])
-    
-if test $printing_b = no; then
-    AC_DEFINE(NPRINT)
-fi
-    
-if test $checking_b = no; then
-    AC_DEFINE(NDEBUG)
-fi
-
-if test $optimise_b = yes; then
-#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
-    AC_DEFINE(STRINGS_UTILS_INLINED)
-fi
-
-# oeps, broken for now
-if test $profile_b = yes; then
-    EXTRA_LIBES="-pg"
-    DEFINES="$DEFINES -pg"
-fi
-
-AC_LANG_CPLUSPLUS
-
-LIB_SUFFIX=.a
-MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT"
-
-AC_SUBST(MODULE_CXXFLAGS)
-AC_SUBST(MODULE_LDFLAGS)
-AC_SUBST(LIB_SUFFIX)
-
-# AC_SUBST(FULL_VERSION)
-# AC_SUBST(MAJOR_VERSION)
-# AC_SUBST(MINOR_VERSION)
-# AC_SUBST(PATCH_LEVEL)
-# AC_SUBST(MY_PATCH_LEVEL)
-
-# libtool.info ...
-# **Never** try to set library version numbers so that they correspond
-# to the release number of your package.  This is an abuse that only
-# fosters misunderstanding of the purpose of library versions.
-
-REVISION=$PATCH_LEVEL
-# CURRENT=$MINOR_VERSION
-CURRENT=`expr $MINOR_VERSION + 1`
-# AGE=$(expr $MAJOR_VERSION + 1)
-AGE=$MAJOR_VERSION
-AC_SUBST(CURRENT)
-AC_SUBST(REVISION)
-AC_SUBST(AGE)
-AC_SUBST(PERL)
-
-AC_PATH_PROG(PERL, perl, error)
-
-AC_FUNC_MEMCMP
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memmem snprintf )
-
-AC_DEFINE_UNQUOTED(MODULE_VERSION, "${FULL_VERSION}")
-
-touch stamp-h.in
-AM_CONFIG_HEADER(config.hh:config.hh.in)
-AC_OUTPUT(Makefile include/Makefile test/Makefile)
-
index 6216111d27ea453e337066bf2a4097aed1ac9074..deb0b19c7c6c3d8bfeece2026694e0af0b28058c 100644 (file)
@@ -3,7 +3,7 @@
 #include "config.hh"
 
 // static char *s = "FlowerLib " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
-static char *s = "FlowerLib " MODULE_VERSION " #%d";
+static char *s = "FlowerLib " FLOWER_VERSION " #%d";
 
 static const int build=
 //#include ".build"
diff --git a/flower/include/GNUmakefile b/flower/include/GNUmakefile
new file mode 100644 (file)
index 0000000..4f60f37
--- /dev/null
@@ -0,0 +1,42 @@
+# flower/include/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+biltdir=../../../build/flower/include
+
+# include Makefile
+include $(biltdir)/Makefile
+
+endif
+
+# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+
+wild-check: check-noinst-headers
+
+check-noinst-headers:
+ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
+       @echo \"$(noinst_HEADERS)\"
+       @echo \"$(CURRENT_noinst_HEADERS)\"
+       @echo noinst_HEADERS changed: rerunning make-wild.
+       @-rm -f Makefile.am
+        $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
index 53217650967f2e311583aee53f90d8686b80a43e..4602b2a2c5b3e615da184f3a3199cbf705c4cb73 100644 (file)
@@ -1,14 +1,17 @@
-# Automatically generated from ./flower/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
-# flower/lib/include/Makefile.am.wild
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
+# flower/include/Makefile.am.wild
 
 noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 5eb223087407d2f7371cbcdff1add36e3c9156a3..9c1e9deff1ba7be313a28d28d6c5e8aaf0d24c01 100644 (file)
@@ -1,9 +1,14 @@
-# flower/lib/include/Makefile.am.wild
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
+# flower/include/Makefile.am.wild
 
 noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
index 7de221c8e110e0af956e6ebffb3e245256e53a8c..5913ab932d5c6f78c2d0f95c5ed5cbeacf73dcc1 100644 (file)
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./flower/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
-# flower/lib/include/Makefile.am.wild
-
-# the wild-perl script needs this.
+# flower/include/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -43,7 +39,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ..
+top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -65,30 +61,50 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AGE = @AGE@
+AUTOGENERATE = @AUTOGENERATE@
+BISON = @BISON@
 CC = @CC@
+COMPILEINFO = @COMPILEINFO@
+CPPFLAGS = @CPPFLAGS@
 CURRENT = @CURRENT@
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+DIR_DATADIR = @DIR_DATADIR@
+EXTRA_LIBES = @EXTRA_LIBES@
+FIND = @FIND@
+FLEX = @FLEX@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
 LIBTOOL = @LIBTOOL@
-LIB_SUFFIX = @LIB_SUFFIX@
+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@
 REVISION = @REVISION@
+TAR = @TAR@
+TEXDIR = @TEXDIR@
+TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
-
-real_topdir = $(top_srcdir)/..
+YACC = @YACC@
+ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc
 
-EXTRA_DIST = Makefile.am.wild
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = ../config.hh
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../flower/config.hh
 CONFIG_CLEAN_FILES = 
 HEADERS =  $(noinst_HEADERS)
 
@@ -97,13 +113,12 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP = --best
 default: all
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flower/include/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        cd $(top_builddir) \
@@ -137,7 +152,7 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = include
+subdir = flower/include
 
 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
@@ -203,8 +218,16 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 4160af814d87b8eac8c34d64fbe4ff552b907d88..587a7f63f1612be4c912e90d57dacb5a4fb31b85 100644 (file)
@@ -34,6 +34,8 @@ public:
   Rational truncated () const;
   void negate ();
   operator bool () const;
+  operator int () const;
+  operator double () const;
   operator String () const;
   Rational operator - () const;
   Rational ();
diff --git a/flower/missing b/flower/missing
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/flower/mkinstalldirs b/flower/mkinstalldirs
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
index 202dd9f0e717912a76e49bf48786bef6bfe4ee0e..df18b4cbcd57cf5b0ecd2d8368d36d667e576698 100644 (file)
 #include "string-convert.hh"  
 #include "libc-extension.hh"
 
-
 Rational::operator bool () const
 {
   return sign_;
 }
 
+Rational::operator int () const
+{
+  return sign_ * num_ / den_;
+}
+
+Rational::operator double () const
+{
+  return (double)sign_ * num_ / den_;
+}
+
 ostream &
 operator << (ostream &o, Rational r)
 {
diff --git a/flower/stamp-h.in b/flower/stamp-h.in
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/flower/test/Makefile.am b/flower/test/Makefile.am
deleted file mode 100644 (file)
index c952130..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# Automatically generated from ./flower/test/Makefile.am.wild by autowild
-# Do not edit
-# Generated automatically by wild-perl 0.1
-#
-# project  LilyPond -- the musical typesetter
-# title           makefile for flowertest
-# file    flower/test/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#      Jan Nieuwenhuizen <jan@digicash.com>
-#      Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
-
-# bin_PROGRAMS = test
-
-# TEST = test
-
-# can't link to libflower: has not been created yet...
-# test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
-
-EXTRA_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
-
-EXTRA_DIST = result Makefile.am.wild $(EXTRA_SOURCES)
-
-noinst_HEADERS = flower-test.hh
-
-INCLUDES = -I../include
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
diff --git a/flower/test/Makefile.am.wild b/flower/test/Makefile.am.wild
deleted file mode 100644 (file)
index 02f8710..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# project  LilyPond -- the musical typesetter
-# title           makefile for flowertest
-# file    flower/test/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#      Jan Nieuwenhuizen <jan@digicash.com>
-#      Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-# the wild-perl script needs this.
-real_topdir = $(top_srcdir)/..
-
-# bin_PROGRAMS = test
-
-# TEST = test
-
-# can't link to libflower: has not been created yet...
-# test_SOURCES = $(wildcard *.cc)
-
-EXTRA_SOURCES = $(wildcard *.cc)
-
-EXTRA_DIST = result Makefile.am.wild $(EXTRA_SOURCES)
-
-noinst_HEADERS = $(wildcard *.hh)
-
-INCLUDES = -I../include
-
diff --git a/flower/test/Makefile.in b/flower/test/Makefile.in
deleted file mode 100644 (file)
index ef867cd..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# 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 and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# 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.
-
-# Automatically generated from ./flower/test/Makefile.am.wild by autowild
-# Do not edit
-# Generated automatically by wild-perl 0.1
-#
-# project  LilyPond -- the musical typesetter
-# title           makefile for flowertest
-# file    flower/test/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#      Jan Nieuwenhuizen <jan@digicash.com>
-#      Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-# the wild-perl script needs this.
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-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 = :
-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@
-
-real_topdir = $(top_srcdir)/..
-
-# bin_PROGRAMS = test
-
-# TEST = test
-
-# can't link to libflower: has not been created yet...
-# test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
-
-EXTRA_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
-
-EXTRA_DIST = result Makefile.am.wild $(EXTRA_SOURCES)
-
-noinst_HEADERS = flower-test.hh
-
-INCLUDES = -I../include
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = ../config.hh
-CONFIG_CLEAN_FILES = 
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-       here=`pwd` && cd $(srcdir) \
-         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       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
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = test
-
-distdir: $(DISTFILES)
-       @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
-info:
-dvi:
-check: all
-       $(MAKE)
-installcheck:
-install-exec: 
-       @$(NORMAL_INSTALL)
-
-install-data: 
-       @$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-       @:
-
-uninstall: 
-
-all: Makefile $(HEADERS)
-
-install-strip:
-       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-       -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)
-
-maintainer-clean-generic:
-       -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 libtool
-
-maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
-               distclean
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info dvi installcheck 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 --top-srcdir="$(real_topdir)" < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/flower/test/flower-test.hh b/flower/test/flower-test.hh
deleted file mode 100644 (file)
index b03a48f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  flower-test.hh -- declare 
-
-  source file of the Flower Library
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-#ifndef FLOWER_TEST_HH
-#define FLOWER_TEST_HH
-#include <iostream.h>
-
-#define ADD_TEST(f) \
-struct f ## Init {\
-    f ## Init () { reg_test(f); }\
-} f ## init\
-
-typedef void (*fptr)(void);
-
-void reg_test (fptr f);
-
-#endif // FLOWER_TEST_HH
diff --git a/flower/test/main.cc b/flower/test/main.cc
deleted file mode 100644 (file)
index 26aaf3c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "flower-test.hh"
-#include "varray.hh"
-
-Array< fptr > *test_arr_p;
-
-void reg_test (fptr f)
-{
- if (!test_arr_p)
-  test_arr_p = new Array<fptr>;
- test_arr_p->push (f);
-}
-
-int
-main ()
-{
- if (test_arr_p)
-   {
-     for (int i=0; i < test_arr_p->size (); i++)
-       (*test_arr_p)[i] ();
-   }
-}
diff --git a/flower/test/mat-test.cc b/flower/test/mat-test.cc
deleted file mode 100644 (file)
index 1ad7af4..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-  mat-test.cc -- test Matrix
-
-  source file of the Flower Library
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#include <iostream.h>
-#include "matrix.hh"
-#include "string.hh"
-#include "flower-test.hh"
-#include "choleski.hh"
-
-void
-matrix()
-{
-  int N=10;
-  Matrix m(N,N), q(N,N);
-  Vector v(N);
-
-  for (int i=0; i < N; i++) {
-    v(i) =i;
-    for (int j=0; j < N; j++) {
-      m(i,j) = i+j;
-      q(i,j) = (abs(i-j) > 3) ?0 :i-j;
-    }
-  }
-
-  cout << "v: " << String(v);
-  cout << "m: " <<  String(m );
-  cout << "q: " <<  String(q);
-  cout << "m*q; " <<  String(m*q);
-  cout << "m*m: " <<  String(m*m);
-  m.OK();
-  cout << "m: " <<  String(m);
-  cout << "q.band " << q.band_i() << endl; 
-  q.try_set_band();
-  cout << "q(B): " << q;
-  q.OK();
-  Matrix sum(q+q);
-  cout << "q + q " << sum;
-  q.OK();
-  cout << "q*q: " << q*q;
-  q.OK();
-
-  Matrix hilbert(N,N), h2(hilbert);
-  for (int i=0; i < N; i++) {
-    for (int j=0; j < N; j++) {
-      hilbert(i,j) = 1/Real(i+j+1);
-      h2 (i,j) = (abs(i-j) > 3) ?0 : hilbert(i,j);
-    }
-  }
-  h2.try_set_band();
-  Choleski_decomposition ch(h2);
-  cout << "red Hilbert  " <<  h2;
-  cout << "choleski " << ch.L;
-  Matrix T =ch.L.transposed();
-  cout << "L^T " <<  T;
-  cout << "L * L^T" << ch.L * T;
-  cout << "H2^{-1} * H2" << h2 * ch.inverse();
-}
-
-ADD_TEST(matrix);
diff --git a/flower/test/pqtest.cc b/flower/test/pqtest.cc
deleted file mode 100644 (file)
index ea28bcb..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "flower-test.hh"
-#include "pqueue.hh"
-#include <stdlib.h>
-
-int compare (int i, int j)
-{
-  return i-j;
-}
-
-void
-pqtest ()
-{
-  PQueue<int> pq;
-
-  for  (int i=0; i < 10; i++) {
-    int r = rand ()/10000;
-    pq.insert (r);
-    cout << "adding: " << r<< endl;
-  }
-  while  (pq.size ()) {
-    cout << "getting : "<< flush;
-    cout << pq.get () << "\n";
-  }
-}
-
-ADD_TEST (pqtest);
diff --git a/flower/test/rattest.cc b/flower/test/rattest.cc
deleted file mode 100644 (file)
index 64cc51e..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <iostream.h>
-#include "rational.hh"
-#include "flower-test.hh"
-#include "string.hh"
-
-
-#define EXP_PRINT(a) #a << ": " << (a) << "\n"
-
-void
-rattest ()
-{
-  Rational r (1,4);
-  Rational q(1,2);
-  Rational s(6,4);
-  Rational i;
-  i.set_infinite (1);
-
-  cout << r << " " << s << " " << q << "\n";
-  cout << r + q << " " << (s * q + s) << " " << (q / r) << "\n";
-  cout << i;
-  cout << "inf * r" << i * r << "inf * inf " << i * i << "inf + r" << i + r;
-  cout << EXP_PRINT(-i);
-  cout << EXP_PRINT(i >? -i) << EXP_PRINT(i >? r);
-  cout << EXP_PRINT(i <? r) ;
-  Rational one(1);
-  cout << EXP_PRINT(one/Rational (4));
-  cout << EXP_PRINT(one + one/Rational (4));
-  Rational nul (0,1);
-  Rational kwart (1,4);
-  nul += kwart;
-  cout << EXP_PRINT(nul);
-  nul -= Rational (2) * kwart;
-  cout << EXP_PRINT(nul);
-
-  cout << EXP_PRINT(Rational (1,128)  + Rational (1919,128));
-
-}
-
-ADD_TEST (rattest);
diff --git a/flower/test/result b/flower/test/result
deleted file mode 100644 (file)
index 1351b5b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-constructors
-hai
-
-10
-c
-0.0132
-compares: 
-
-abc
-abcd
-zxy
-hay = "foobarbazblub" len=13
-index_i('b') b= 3
-last_index_i('b') b= 12
-index_i("bar"): 3
-index_any("bar"): b: 3
- left_str(-1): 
- right_str( -1): 
- left_str(0): 
- right_str( 0): 
- left_str(1): h
- right_str( 1): i
- left_str(2): ha
- right_str( 2): ai
- left_str(3): hai
- right_str( 3): hai
- left_str(4): hai
- right_str( 4): hai
-blonde haren
-mid(2,6)=onde h
-nomid(2,6)=blaren
-hai
-left
-hai daar
-Hallo daaR!
-up: HALLO DAAR! down: hallo daar!
-`Hallo daaR!' is not empty
-`' is empty
-ff
--1:ff
diff --git a/flower/test/stringtest.cc b/flower/test/stringtest.cc
deleted file mode 100644 (file)
index 4597ff3..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-  stupid test program to verify stringlib
-  stringtest.cc
-  */
-#include "string.hh"
-#include "varray.hh"
-#include "string-convert.hh"
-#include "flower-test.hh"
-
-void
-ctors ()
-{
-  cout << "constructors"<<endl;
-  {
-    String str ("hai");
-    cout << str << endl;
-  }
-  {
-    String fromi (10);
-    cout << fromi<< endl;
-  }
-  {String fromf (1.32e-2, "%g");
-  cout << fromf<< endl;
-  }
-  {
-    String def;
-    cout << def << endl;
-  }
-  {
-    String fromc ('c');
-    cout << fromc<< endl;       
-  }
-}
-void
-cmp ()
-{
-  
-  String path  = "";
-  String sep ('/');
-  String right(path.right_str (1));
-  cout << "cmp ('', '/'): " << String::compare_i (sep,right) << endl;
-  
-  Array<String> a;
-  a.push ("abcd");
-  a.push ("zxy");
-  a.push ("abc");
-  a.push ("");
-  a.push  ("a");
-  a.sort (String::compare_i);
-  cout << "compares: "<<endl;
-  for  (int i=0; i < a.size (); i++)
-    cout << a[i] << endl;
-}
-
-
-void
-searching ()
-{
-  String hay = "foobarbazblub";
-
-  char c =   'b';
-  String cstr =c;
-  String set = "bar";
-  cout << "hay = \"" << hay << "\" len="<< hay.length_i ()<<endl;
-  cout << "index_i ('"<< c<<"') " << c << "= " << hay.index_i (c) <<endl;
-  cout << "last_index_i ('"<< c<<"') " << c << "= " << hay.index_last_i (c) <<endl;    
-  //    cout << "last index of cstr " << c << ": " << hay.index_last_i (cstr) <<endl;    
-  //    cout << "index_last_i (\""<<set<<"\"): " << hay.index_last_i (set) <<endl;
-  cout << "index_i (\""<<set<<"\"): " << hay.index_i (set) <<endl;    
-  cout << "index_any (\"" << set << "\"): " << cstr << ": " << hay.index_any_i (cstr) <<endl;
-
-    
-    
-}
-
-
-void
-kutenpeer ()
-{
-  String str ("hai");
-  for  (int i=-1; i < str.length_i ()+2; i++) {
-    cout<<" left_str (" << i<<"): " << str.left_str (i) << endl;
-    cout<<" right_str ("<<i<<"): " << str.right_str (i) << endl;
-  }
-  str = "blonde haren";
-  cout << str<<endl;
-  cout << "mid (2,6)="<<str.cut (2,6)<<endl;
-  cout << "nomid (2,6)="<<str.nomid_str (2,6)<<endl;
-}
-
-bool
-test_empty_b (String str)
-{
-  cout << "`" << str << "' is ";
-
-  if  (str == String ("")) {
-    cout << "empty" << endl;
-    return true;
-  }
-
-  cout << "not empty" << endl;
-  return false;
-}
-
-void
-stringtest ()
-{
-  ctors ();
-  cmp ();
-  searching ();
-  kutenpeer ();
-  String str ("hai");
-  cout <<  str << endl;
-  cout << "left" << endl;
-  str += " daar";
-  cout << str << endl;
-
-  //    str = String ("Hallo") + " daaR" + '!'; // no go on doze-s gcc2.7.2?
-  str = String ("Hallo") + " daaR" + "!";
-  cout << str << endl;
-
-  cout << "up: " << str.upper_str () << " down: " << str.lower_str ()<<endl;
-    
-  if  (test_empty_b (str))
-    cout << "failed";
-
-  String fn = "";
-  if  (!test_empty_b (fn))
-    cout << "failed";
-
-    
-  fn = "";
-  fn += "";
-  delete fn.copy_byte_p ();
-  delete str.copy_byte_p ();
-
-  cout << String_convert::bin2hex_str (String ( (char)0xff)) << endl;
-  cout << "-1:" << String_convert::i2hex_str (-1, 2, '0');
-  cout << endl;
-
-}
-
-
-ADD_TEST (stringtest);
diff --git a/flowertest/GNUmakefile b/flowertest/GNUmakefile
new file mode 100644 (file)
index 0000000..7026cec
--- /dev/null
@@ -0,0 +1,58 @@
+# flower/test/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+biltdir=../flowertest
+
+make-in-build: wild-check
+       exec $(MAKE) -C $(biltdir)
+
+# include Makefile
+include $(biltdir)/Makefile
+
+endif
+
+# Makefile.am.wild: test_SOURCES = $(wildcard *.cc)
+CURRENT_test_SOURCES = $(wildcard *.cc)
+# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh)
+CURRENT_noinst_HEADERS = $(wildcard *.hh)
+
+wild-check: check-extra-sources check-noinst-headers
+
+check-test-sources:
+ifneq ($(test_SOURCES),$(CURRENT_test_SOURCES))
+       @echo \"$(test_SOURCES)\"
+       @echo \"$(CURRENT_test_SOURCES)\"
+       @echo  test_SOURCES changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
+check-noinst-headers:
+ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
+       @echo \"$(noinst_HEADERS)\"
+       @echo \"$(CURRENT_noinst_HEADERS)\"
+       @echo  noinst_HEADERS changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
+all:
diff --git a/flowertest/Makefile.am b/flowertest/Makefile.am
new file mode 100644 (file)
index 0000000..6f8250c
--- /dev/null
@@ -0,0 +1,27 @@
+# Generated automatically by wild-perl 0.1
+# project  LilyPond -- the musical typesetter
+# title           makefile for flowertest
+# file    flowertest/Makefile.am.wild
+
+bin_PROGRAMS = test
+
+TESTS = $(top_srcdir)/flowertest/check.sh
+
+test_SOURCES = 
+
+test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
+
+EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
+
+noinst_HEADERS = 
+
+INCLUDES = -I$(top_srcdir)/flower/include
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
diff --git a/flowertest/Makefile.am.wild b/flowertest/Makefile.am.wild
new file mode 100644 (file)
index 0000000..abbf5dd
--- /dev/null
@@ -0,0 +1,24 @@
+# project  LilyPond -- the musical typesetter
+# title           makefile for flowertest
+# file    flowertest/Makefile.am.wild
+
+bin_PROGRAMS = test
+
+TESTS = $(top_srcdir)/flowertest/check.sh
+
+test_SOURCES = $(wildcard *.cc)
+
+test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
+
+EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
+
+noinst_HEADERS = $(wildcard *.hh)
+
+INCLUDES = -I$(top_srcdir)/flower/include
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
diff --git a/flowertest/Makefile.in b/flowertest/Makefile.in
new file mode 100644 (file)
index 0000000..8f697b1
--- /dev/null
@@ -0,0 +1,358 @@
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
+
+# 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 and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# 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    flowertest/Makefile.am.wild
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+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 = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AGE = @AGE@
+AUTOGENERATE = @AUTOGENERATE@
+BISON = @BISON@
+CC = @CC@
+COMPILEINFO = @COMPILEINFO@
+CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+DIR_DATADIR = @DIR_DATADIR@
+EXTRA_LIBES = @EXTRA_LIBES@
+FIND = @FIND@
+FLEX = @FLEX@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LIBTOOL = @LIBTOOL@
+LN = @LN@
+LN_S = @LN_S@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MFDIR = @MFDIR@
+NM = @NM@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+POD2HTML = @POD2HTML@
+POD2MAN = @POD2MAN@
+PYTHON = @PYTHON@
+RANLIB = @RANLIB@
+REVISION = @REVISION@
+TAR = @TAR@
+TEXDIR = @TEXDIR@
+TEXPREFIX = @TEXPREFIX@
+VERSION = @VERSION@
+YACC = @YACC@
+ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
+
+bin_PROGRAMS = test
+
+TESTS = $(top_srcdir)/flowertest/check.sh
+
+test_SOURCES = 
+
+test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
+
+EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
+
+noinst_HEADERS = 
+
+INCLUDES = -I$(top_srcdir)/flower/include
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../flower/config.hh
+CONFIG_CLEAN_FILES = 
+PROGRAMS =  $(bin_PROGRAMS)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
+LIBS = @LIBS@
+test_OBJECTS = 
+test_DEPENDENCIES =  $(top_builddir)/flower/libflower.la
+test_LDFLAGS = 
+HEADERS =  $(noinst_HEADERS)
+
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+GZIP = --best
+SOURCES = $(test_SOURCES)
+OBJECTS = $(test_OBJECTS)
+
+default: all
+
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flowertest/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(bindir)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         if test -f $$p; then \
+           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)
+       list='$(bin_PROGRAMS)'; for p in $$list; do \
+         rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+       done
+
+.c.o:
+       $(COMPILE) -c $<
+
+.s.o:
+       $(COMPILE) -c $<
+
+.S.o:
+       $(COMPILE) -c $<
+
+mostlyclean-compile:
+       -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+       -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:
+
+test: $(test_OBJECTS) $(test_DEPENDENCIES)
+       @rm -f test
+       $(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+       here=`pwd` && cd $(srcdir) \
+         && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       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
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = flowertest
+
+distdir: $(DISTFILES)
+       @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
+check-TESTS: $(TESTS)
+       @failed=0; all=0; \
+       srcdir=$(srcdir); export srcdir; \
+       for tst in $(TESTS); do \
+         if test -f $$tst; then dir=.; \
+         else dir="$(srcdir)"; fi; \
+         if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+           all=`expr $$all + 1`; \
+           echo "PASS: $$tst"; \
+         elif test $$? -ne 77; then \
+           all=`expr $$all + 1`; \
+           failed=`expr $$failed + 1`; \
+           echo "FAIL: $$tst"; \
+         fi; \
+       done; \
+       if test "$$failed" -eq 0; then \
+         banner="All $$all tests passed"; \
+       else \
+         banner="$$failed of $$all tests failed"; \
+       fi; \
+       dashes=`echo "$$banner" | sed s/./=/g`; \
+       echo "$$dashes"; \
+       echo "$$banner"; \
+       echo "$$dashes"; \
+       test "$$failed" -eq 0
+info:
+dvi:
+check: all
+       $(MAKE) check-TESTS
+installcheck:
+install-exec: install-binPROGRAMS
+       @$(NORMAL_INSTALL)
+
+install-data: 
+       @$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+       @:
+
+uninstall: uninstall-binPROGRAMS
+
+all: Makefile $(PROGRAMS) $(HEADERS)
+
+install-strip:
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+       $(mkinstalldirs)  $(bindir)
+
+
+mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+       -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)
+
+maintainer-clean-generic:
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-compile \
+               mostlyclean-libtool mostlyclean-tags \
+               mostlyclean-generic
+
+clean:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+               clean-generic mostlyclean
+
+distclean:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+               distclean-tags distclean-generic clean
+       -rm -f config.status
+       -rm -f libtool
+
+maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
+               maintainer-clean-libtool maintainer-clean-tags \
+               maintainer-clean-generic distclean
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
+clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
+install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \
+info dvi installcheck install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+$(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/flowertest/check.sh b/flowertest/check.sh
new file mode 100644 (file)
index 0000000..3140673
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+./test > result.test
+# ugh
+cmp result.test $LILYPOND_SOURCEDIR/flowertest/result
+exit $?
+
diff --git a/flowertest/result b/flowertest/result
new file mode 100644 (file)
index 0000000..98c6ca2
--- /dev/null
@@ -0,0 +1,230 @@
+constructors
+hai
+10
+0.0132
+
+c
+cmp ('', '/'): 1
+compares: 
+
+a
+abc
+abcd
+zxy
+hay = "foobarbazblub" len=13
+index_i ('b') b= 3
+last_index_i ('b') b= 12
+index_i ("bar"): 3
+index_any ("bar"): b: 3
+ left_str (-1): 
+ right_str (-1): 
+ left_str (0): 
+ right_str (0): 
+ left_str (1): h
+ right_str (1): i
+ left_str (2): ha
+ right_str (2): ai
+ left_str (3): hai
+ right_str (3): hai
+ left_str (4): hai
+ right_str (4): hai
+blonde haren
+mid (2,6)=onde h
+nomid (2,6)=blaren
+hai
+left
+hai daar
+Hallo daaR!
+up: HALLO DAAR! down: hallo daar!
+`Hallo daaR!' is not empty
+`' is empty
+ff
+-1:ff
+1/4 3/2 1/2
+3/4 9/4 2
+infinityinf * rinfinityinf * inf infinityinf + rinfinity-i: -infinity
+i >? -i: infinity
+i >? r: infinity
+i <? r: 1/4
+one/Rational (4): 1/4
+one + one/Rational (4): 5/4
+nul: 1/4
+nul: -1/4
+Rational (1,128) + Rational (1919,128): 15
+adding: 180428
+adding: 84693
+adding: 168169
+adding: 171463
+adding: 195774
+adding: 42423
+adding: 71988
+adding: 164976
+adding: 59651
+adding: 118964
+getting : 42423
+getting : 59651
+getting : 71988
+getting : 84693
+getting : 118964
+getting : 164976
+getting : 168169
+getting : 171463
+getting : 180428
+getting : 195774
+v: vector [0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 ]m: matrix { (Full_storage)
+0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 
+1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 
+2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 
+3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 
+4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 
+5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 
+6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 
+7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 
+8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 
+9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 18.000000 
+}
+q: matrix { (Full_storage)
+0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 
+3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 
+0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 
+0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 
+0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 
+0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 
+}
+m*q; matrix { (Full_storage)
+14.000000 20.000000 25.000000 28.000000 28.000000 28.000000 28.000000 -2.000000 -25.000000 -40.000000 
+20.000000 25.000000 28.000000 28.000000 28.000000 28.000000 28.000000 -5.000000 -30.000000 -46.000000 
+26.000000 30.000000 31.000000 28.000000 28.000000 28.000000 28.000000 -8.000000 -35.000000 -52.000000 
+32.000000 35.000000 34.000000 28.000000 28.000000 28.000000 28.000000 -11.000000 -40.000000 -58.000000 
+38.000000 40.000000 37.000000 28.000000 28.000000 28.000000 28.000000 -14.000000 -45.000000 -64.000000 
+44.000000 45.000000 40.000000 28.000000 28.000000 28.000000 28.000000 -17.000000 -50.000000 -70.000000 
+50.000000 50.000000 43.000000 28.000000 28.000000 28.000000 28.000000 -20.000000 -55.000000 -76.000000 
+56.000000 55.000000 46.000000 28.000000 28.000000 28.000000 28.000000 -23.000000 -60.000000 -82.000000 
+62.000000 60.000000 49.000000 28.000000 28.000000 28.000000 28.000000 -26.000000 -65.000000 -88.000000 
+68.000000 65.000000 52.000000 28.000000 28.000000 28.000000 28.000000 -29.000000 -70.000000 -94.000000 
+}
+m*m: matrix { (Full_storage)
+285.000000 330.000000 375.000000 420.000000 465.000000 510.000000 555.000000 600.000000 645.000000 690.000000 
+330.000000 385.000000 440.000000 495.000000 550.000000 605.000000 660.000000 715.000000 770.000000 825.000000 
+375.000000 440.000000 505.000000 570.000000 635.000000 700.000000 765.000000 830.000000 895.000000 960.000000 
+420.000000 495.000000 570.000000 645.000000 720.000000 795.000000 870.000000 945.000000 1020.000000 1095.000000 
+465.000000 550.000000 635.000000 720.000000 805.000000 890.000000 975.000000 1060.000000 1145.000000 1230.000000 
+510.000000 605.000000 700.000000 795.000000 890.000000 985.000000 1080.000000 1175.000000 1270.000000 1365.000000 
+555.000000 660.000000 765.000000 870.000000 975.000000 1080.000000 1185.000000 1290.000000 1395.000000 1500.000000 
+600.000000 715.000000 830.000000 945.000000 1060.000000 1175.000000 1290.000000 1405.000000 1520.000000 1635.000000 
+645.000000 770.000000 895.000000 1020.000000 1145.000000 1270.000000 1395.000000 1520.000000 1645.000000 1770.000000 
+690.000000 825.000000 960.000000 1095.000000 1230.000000 1365.000000 1500.000000 1635.000000 1770.000000 1905.000000 
+}
+m: matrix { (Full_storage)
+0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 
+1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 
+2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 
+3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 
+4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 
+5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 
+6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 
+7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 
+8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 
+9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 18.000000 
+}
+q.band 3
+q(B): matrix { (Diagonal_storage)
+0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 
+3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 
+0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 
+0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 
+0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 
+0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 
+}
+q + q matrix { (Diagonal_storage)
+0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 0.000000 
+6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 
+0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 
+0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 
+0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 
+0.000000 0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 
+}
+q*q: matrix { (Full_storage)
+-14.000000 -8.000000 -2.000000 4.000000 10.000000 12.000000 9.000000 0.000000 0.000000 0.000000 
+-8.000000 -15.000000 -10.000000 -5.000000 4.000000 10.000000 12.000000 9.000000 0.000000 0.000000 
+-2.000000 -10.000000 -19.000000 -16.000000 -5.000000 4.000000 10.000000 12.000000 9.000000 0.000000 
+4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 10.000000 12.000000 9.000000 
+10.000000 4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 10.000000 12.000000 
+12.000000 10.000000 4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 10.000000 
+9.000000 12.000000 10.000000 4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 
+0.000000 9.000000 12.000000 10.000000 4.000000 -5.000000 -16.000000 -19.000000 -10.000000 -2.000000 
+0.000000 0.000000 9.000000 12.000000 10.000000 4.000000 -5.000000 -10.000000 -15.000000 -8.000000 
+0.000000 0.000000 0.000000 9.000000 12.000000 10.000000 4.000000 -2.000000 -8.000000 -14.000000 
+}
+red Hilbert  matrix { (Diagonal_storage)
+1.000000 0.500000 0.333333 0.250000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.500000 0.333333 0.250000 0.200000 0.166667 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.333333 0.250000 0.200000 0.166667 0.142857 0.125000 0.000000 0.000000 0.000000 0.000000 
+0.250000 0.200000 0.166667 0.142857 0.125000 0.111111 0.100000 0.000000 0.000000 0.000000 
+0.000000 0.166667 0.142857 0.125000 0.111111 0.100000 0.090909 0.083333 0.000000 0.000000 
+0.000000 0.000000 0.125000 0.111111 0.100000 0.090909 0.083333 0.076923 0.071429 0.000000 
+0.000000 0.000000 0.000000 0.100000 0.090909 0.083333 0.076923 0.071429 0.066667 0.062500 
+0.000000 0.000000 0.000000 0.000000 0.083333 0.076923 0.071429 0.066667 0.062500 0.058824 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.071429 0.066667 0.062500 0.058824 0.055556 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.062500 0.058824 0.055556 0.052632 
+}
+choleski matrix { (Diagonal_storage)
+1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.500000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.333333 1.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.250000 0.900000 1.500000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 2.000000 -4.285714 30.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 22.500000 -213.888889 -4.533714 1.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 280.000000 4.505388 -1.431002 1.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 -0.129061 -0.078559 -0.117004 1.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 -0.012340 -0.056993 0.571666 1.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.021092 0.430265 1.115863 1.000000 
+}
+L^T matrix { (Diagonal_storage)
+1.000000 0.500000 0.333333 0.250000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 1.000000 1.000000 0.900000 2.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 1.000000 1.500000 -4.285714 22.500000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 1.000000 30.000000 -213.888889 280.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 1.000000 -4.533714 4.505388 -0.129061 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 -1.431002 -0.078559 -0.012340 0.000000 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 -0.117004 -0.056993 -0.021092 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.571666 0.430265 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 1.115863 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 
+}
+L * L^Tmatrix { (Full_storage)
+1.000000 0.500000 0.333333 0.250000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.500000 1.250000 1.166667 1.025000 2.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.333333 1.166667 2.111111 2.483333 -2.285714 22.500000 0.000000 0.000000 0.000000 0.000000 
+0.250000 1.025000 2.483333 4.122500 25.371429 -180.138889 280.000000 0.000000 0.000000 0.000000 
+0.000000 2.000000 -2.285714 25.371429 923.367347 -6517.628952 8404.505387 -0.129061 0.000000 0.000000 
+0.000000 0.000000 22.500000 -180.138889 -6517.628952 46276.261351 -59910.746028 0.506565 -0.012340 0.000000 
+0.000000 0.000000 0.000000 280.000000 8404.505387 -59910.746028 78423.346283 -0.586054 -0.039335 -0.021092 
+0.000000 0.000000 0.000000 0.000000 -0.129061 0.506565 -0.586054 1.036518 0.579304 0.432733 
+0.000000 0.000000 0.000000 0.000000 0.000000 -0.012340 -0.039335 0.579304 1.330202 1.363033 
+0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.021092 0.432733 1.363033 2.430723 
+}
+H2^{-1} * H2matrix { (Full_storage)
+1.000000 0.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 
+0.000000 1.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 
+0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 
+0.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 -0.000000 0.000000 -0.000000 0.000000 
+-0.000000 0.000000 -0.000000 0.000000 1.000000 -0.000000 -0.000000 0.000000 -0.000000 0.000000 
+-0.000000 0.000000 -0.000000 0.000000 -0.000000 1.000000 -0.000000 -0.000000 0.000000 -0.000000 
+0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 1.000000 0.000000 0.000000 0.000000 
+-0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 -0.000000 1.000000 -0.000000 0.000000 
+-0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 -0.000000 0.000000 1.000000 0.000000 
+-0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 -0.000000 0.000000 -0.000000 1.000000 
+}
index 21e4f1a98760d0125971be076fd4f65855080cdc..9d3d081e666f728a1ff9ff2d3fbf75a4bb7c8c62 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./init/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # init/Makefile.am.wild
 
@@ -22,4 +20,4 @@ uninstall-local:
        for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
        -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 29093833f36c643c3cdecf5ff24fe4fee527c565..655dd491681895e89c4819a714b7977a36e619fe 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./init/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # init/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -107,7 +108,7 @@ CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.
 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))
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -206,7 +207,7 @@ uninstall-local:
        for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
        -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 415cfa8353b90163758b95bcfaf0c9b48bbd6d6d..d9680a0f193932ed4e416f658911e355888cbd42 100644 (file)
@@ -12,7 +12,8 @@ table_sixteen=
 
      "style" = \table {
                "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
-               "roman" "\settext{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
+%              "roman" "\settext{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
+               "roman" "\settext{%}"   0.0\pt  9.50\pt 0.0\pt  8.0\pt
                "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  8.0\pt
                "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  4.0\pt
index 1b6aa6bf03cfebb27c99af4bc38d8c49e9681791..e684494a8ab3f78a7bf6167d6aafe27a658c9542 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./input/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # input/Makefile.am.wild
 
@@ -13,4 +11,4 @@ OUTFILES = $(M4FILES:%.m4=%)
 default: all $(OUTFILES)
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index b250825e4c101eaacf30444f82c9607b4ea7a32a..3870bea6b4e758b2168aa1068254796dd65d060e 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./input/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # input/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -106,7 +107,7 @@ EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
 
 OUTFILES = $(M4FILES:%.m4=%)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in TODO
 
@@ -197,7 +198,7 @@ mostlyclean distclean maintainer-clean
 default: all $(OUTFILES)
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 7fb5d45daa705b3b5bc0d91db5ef588632616612..c1a8a944b82657bb963dc668aaab62b292aeb70d 100644 (file)
@@ -1,10 +1,64 @@
+$somewhat_long = \lyric{
+       \textstyle "roman" ;
+       AaaaaaA2
+       BbbbbbB2
+       CcccccC2 
+       DdddddD2
+       EeeeeeE2
+       FfffffF2
+}
+
+$rather_long = \lyric{
+       \textstyle "roman" ;
+       LLLLoooonggggg2 
+       Syyllllaaabbble2 
+       LLLLoooonggggg2 
+       Syyllllllaaabbble2
+       LLLLoooonggggg2 
+       Syyyylllaaabbble2
+}
+
+$quite_long = \lyric{
+       \textstyle "roman" ;
+       LLLLLLLLLooooongggggggg2 
+       Syyyyyyyyyyyyylllllllaaaaaabbble2 
+       LLLLLLLLLooooongggggggg2 
+       Syyyyyyyyyyyyylllllllaaaaaabbble2
+       LLLLLLLLLooooongggggggg2 
+       Syyyyyyyyyyyyylllllllaaaaaabbble2
+}
+
+$somewhat_long_lyrics_staff = \type Lyrics = somewhat <
+       \$somewhat_long
+>
+
+$rather_long_lyrics_staff = \type Lyrics = rather <
+       \$rather_long
+>
+
+$quite_long_lyrics_staff = \type Lyrics = quite <
+       \$quite_long
+>
+
+melody = \melodic{
+       \octave c'; 
+       c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4
+       c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4
+}
+
+$melodic_staff = \type Staff = mel <
+       \melody
+>
 
 \score
 {
-       < \type Staff 
-               \melodic { \octave c'; c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  }
-       \type Lyrics
-               \lyric { LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 }
+       <
+               \$melodic_staff
+               \$somewhat_long_lyrics_staff    
+%              \$rather_long_lyrics_staff      
+%              \$quite_long_lyrics_staff       
        >
+       \paper{
+%              castingalgorithm = \Wordwrap;   
+       }
 }
-       
index c302e05ac40922b1d60621a9c3a611129463c083..f1349f96330516dd8c9b17dfca2407ca7aad722b 100644 (file)
@@ -84,7 +84,8 @@ hegedraagjetekst = \lyric{
 
 texte = \lyric{ 
         
-       \textstyle "italic" ;
+%      \textstyle "italic" ;
+       \textstyle "roman" ;
        Ah!4 vous dir- ai_- je ma man2
        Ce4 qui cau- se mon tour- ment2
        Pa-4 pa veut que je rai- sonne2
@@ -126,27 +127,51 @@ textiii = \lyric{
        
 }
 
+$top_lyrics = \type Lyrics = top <
+       \global 
+       \tekst
+>
+
+$treble_staff = \type Staff = treble <
+       \global
+       \melody 
+>
+
+$bass_staff = \type Staff = bass <
+       \global
+       \accompany
+>
+
+$middle_lyrics = \type Lyrics = middle <
+       \global
+       \texte
+>
+
+$bottom_lyrics = \type Lyrics = bottom <
+       \global
+       \texti
+       \textii
+       \textiii
+>
+
+$grand_staff = \type Staff_group <
+       \$treble_staff
+       \$middle_lyrics
+       \$bass_staff
+>
+
 \score{
        < 
-               \lyric \type Lyrics = top < 
-                       \global \tekst >
-               \type Staff_group < 
-               \type Staff=treb < \global  
-                         \melody >
-               \lyric \type Lyrics  = "Middle" <  \global
-                       \texte >
-               \type Staff=bass        < \global 
-                       \accompany >
-               % ugh
-               >
-               \lyric \type Lyrics  = bottomlyrics < \global
-                       \texti \textii \textiii >
-               
+               \$treble_staff
+               \$middle_lyrics
+               \$top_lyrics
+               \$grand_staff
+               \$bottom_lyrics
        >
        \paper{
                % use a lot of space, to avoid clashing syllables
-               arithmetic_multiplier = 8.\pt;
-               gourlay_maxmeasures = 14.0;
+%              arithmetic_multiplier = 8.\pt;
+%              gourlay_maxmeasures = 14.0;
        }
        \midi{ 
                \tempo 4 = 120 ;
diff --git a/lib/GNUmakefile b/lib/GNUmakefile
new file mode 100644 (file)
index 0000000..18b8c08
--- /dev/null
@@ -0,0 +1,54 @@
+# lib/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+biltdir=../../build/lib
+
+make-in-build: wild-check
+       exec $(MAKE) -C $(biltdir)
+
+# include Makefile
+include $(biltdir)/Makefile
+
+clean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+dist: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+distclean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+endif
+
+# Makefile.am.wild: liblily_la_SOURCES = $(wildcard *.cc)
+CURRENT_liblily_la_SOURCES = $(wildcard *.cc)
+
+wild-check: check-lily-la-sources
+
+check-lily-la-sources:
+ifneq ($(liblily_la_SOURCES),$(CURRENT_libflower_la_SOURCES))
+       @echo \"$(liblily_la_SOURCES)\"
+       @echo \"$(CURRENT_liblily_la_SOURCES)\"
+       @echo  liblily_la_SOURCES changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
index 5554677441da4f5d283fbedc906e1c39f0c70cea..6bb5a1746567fdeeef35aa5f9553fe7f67ed1a01 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./lib/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for micro-lily-lib
@@ -16,12 +14,12 @@ lib_LTLIBRARIES = liblily.la
 
 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
+INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
 MODULE_CXXFLAGS += -D_REENTRANT
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 
 distclean-local:
        -rm -rf .deps
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 3185791ed7d9b1bd433ffa013e300be3228bc659..8526bd5784e78e8aaaebc14439eaf009878eeb76 100644 (file)
@@ -13,10 +13,10 @@ lib_LTLIBRARIES = liblily.la
 
 liblily_la_SOURCES = $(wildcard *.cc)
 
-INCLUDES = -Iinclude -I../flower/include
+INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
 MODULE_CXXFLAGS += -D_REENTRANT
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 
 distclean-local:
        -rm -rf .deps
index e796b2ea38ec6628e6f97dc856ea709f0bc58458..a68b3669b954068bb3e03f7d3ca8898b6fa9905a 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./lib/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for micro-lily-lib
@@ -69,14 +67,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -84,6 +83,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -98,6 +98,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -112,17 +113,16 @@ lib_LTLIBRARIES = liblily.la
 
 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
+INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-LDFLAGS = @LDFLAGS@
+DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
 LIBS = @LIBS@
 liblily_la_LDFLAGS = 
 liblily_la_LIBADD = 
@@ -308,147 +308,13 @@ distdir: $(DISTFILES)
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-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 \
-       ../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/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/source-file.hh \
-       include/binary-source-file.hh \
-       ../flower/include/string-convert.hh
-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 \
-       ../flower/include/compare.hh \
-       ../flower/include/arithmetic-operator.hh include/plet.hh \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/varray.hh \
-       include/warn.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 \
-       ../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/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/source-file.hh \
-       include/source.hh include/moment.hh \
-       ../flower/include/rational.hh include/duration.hh \
-       include/plet.hh include/duration-convert.hh \
-       ../flower/include/varray.hh
-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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/varray.hh include/proto.hh \
-       include/source-file.hh include/source.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
-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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/source.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/source-file.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.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.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 \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/warn.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/proto.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/warn.hh \
-       include/windhoos-suck-suck-suck-thank-you-cygnus.hh \
-       include/source-file.hh include/simple-file-storage.hh \
-       include/file-storage.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.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/source.hh ../flower/include/path.hh \
-       ../flower/include/varray.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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.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 \
-       ../flower/include/cursor.tcc ../flower/include/list.tcc
-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.lo windhoos-suck-suck-suck-thank-you-cygnus.o: \
-       windhoos-suck-suck-suck-thank-you-cygnus.cc
 
 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 $(LTLIBRARIES) config.hh
+all-am: Makefile $(LTLIBRARIES)
 
 install-exec-am: install-libLTLIBRARIES
 
@@ -465,7 +331,7 @@ install: install-recursive install-exec-am
 
 uninstall: uninstall-recursive uninstall-am
 
-all: all-recursive-am all-am
+all: all-recursive all-am
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
@@ -527,17 +393,17 @@ 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 \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+installcheck 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
 
 MODULE_CXXFLAGS += -D_REENTRANT
 
 distclean-local:
        -rm -rf .deps
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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/lib/include/GNUmakefile b/lib/include/GNUmakefile
new file mode 100644 (file)
index 0000000..59fa4ce
--- /dev/null
@@ -0,0 +1,43 @@
+# lib/include/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+biltdir=../../../build/lib/include
+
+# include Makefile
+include $(biltdir)/Makefile
+
+endif
+
+# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+# CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+CURRENT_noinst_HEADERS = $(wildcard *.hh)
+
+wild-check: check-noinst-headers
+
+check-noinst-headers:
+ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
+       @echo \"$(noinst_HEADERS)\"
+       @echo \"$(CURRENT_noinst_HEADERS)\"
+       @echo  noinst_HEADERS changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
index 25185ebf6b7a367e9bf01c2024765d1e90b6eadf..1b8c110a786bd15fc817025696157f93577a542e 100644 (file)
@@ -1,11 +1,17 @@
-# Automatically generated from ./lib/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # lib/include/Makefile
 
 noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 3d8f06070017cb352c846bdc6d9bb7015e99bc38..9f406b550123c4721963e2bec27a3231dcfaef98 100644 (file)
@@ -2,5 +2,13 @@
 
 noinst_HEADERS = $(wildcard *.hh)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
index 2efb0f8fc0187bcf0737c8a0151d05279c54891a..1b35682d67824a2f52a693183cfb96bbb7e8af97 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./lib/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # lib/include/Makefile
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -101,9 +102,9 @@ absolute_builddir = @absolute_builddir@
 
 noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../lib/config.hh
+CONFIG_HEADER = ../../flower/config.hh
 CONFIG_CLEAN_FILES = 
 HEADERS =  $(noinst_HEADERS)
 
@@ -217,8 +218,16 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 781a53d2798f66a75cf87324c1fcc4b9b793d8df..2ea84593a96794c2a2ff2f703e8ed58750dc4502 100644 (file)
 #include "cursor.tcc"
 #include "list.tcc"
 
-#if 0
+#if !defined(__CYGWIN32__) && __GNUC_MINOR__ < 8
 LIST_INSTANTIATE (void *);
-
-#else
-
-    static void force_list_members ()
-    {
-    List<void*> bla;
-    bla.top().add ((void*)0);
-    }
-
 #endif
 
 POINTERLIST_INSTANTIATE (Source_file);
index 0fe59e0fe13af6cd6d9f35948ca8bb59c7589d1f..0a05b2684968ebd32c77b39796a6290ea2f0e66e 100644 (file)
@@ -7,25 +7,66 @@
 
 # automake/wild-make should generate this file from Makefile.am.wild
 
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
 include Makefile
 
-# Makefile.am.wild: lilypond_SOURCES = $(wildcard *.cc)
-CURRENT_lilypond_SOURCES = $(wildcard *.cc)
+biltdir=.
+
+else
+
+#ugh
+biltdir=../../build/lily
+
+make-in-build: wild-check
+       echo exec $(MAKE) -C $(biltdir)
+       exec $(MAKE) -C $(biltdir)
+
+include $(biltdir)/Makefile
+
+clean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+dist: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+distclean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+lexer.cc: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+parser.hh: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+parser.cc: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+#ugh OMIT_DEPENDENCIES does not seem to work
+.deps/lexer.P:
+       exec $(MAKE) -C $(biltdir) $@
+
+.deps/parser.P:
+       exec $(MAKE) -C $(biltdir) $@
+
+endif
 
-# ugh: there is a dummy file 'wild-check' to satisfy the wild-check target
-# for non-GNU makes in Makefile(.test)
-# but we'll ignore that
-# .PHONY: wild-check
+# Makefile.am.wild: lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
+# ugh
+CURRENT_lilypond_SOURCES = $(wildcard *.cc lexer.ll parser.yy)
 
 # ugh: stupid lexer.cc/parser.cc cluttering sourcedir!
-# but it works fine in other dirs (see ../mi2mu)
-# wild-check: check-lilypond-sources
+wild-check: check-lilypond-sources
 
 check-lilypond-sources:
-ifneq ($(lilypond_SOURCES),$(CURRENT_mi2mu_SOURCES))
+ifneq ($(lilypond_SOURCES),$(filter-out $(IGNORE_WILDCARDS), $(CURRENT_lilypond_SOURCES)))
        @echo \"$(lilypond_SOURCES)\"
        @echo \"$(CURRENT_lilypond_SOURCES)\"
-       @echo  lilypond_SOURCES changed: NOT yet rerunning make-wild.  Please type:
-       @echo "$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am"
+       @echo  lilypond_SOURCES changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
 endif
 
index 7262ac7da7ed16e093f2624b504c9fa69091ec44..ceab122e88e2c6af4261ef0e41f8687071da5fcd 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./lily/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter # title     makefile for lilypond
 # file    lily/Makefile.am.wild
@@ -14,9 +12,15 @@ SUBDIRS = include
 bin_PROGRAMS = lilypond
 
 # ignoring wildcards for `lexer.cc'
-# ignoring wildcards for `parser.cc'
+IGNORE_WILDCARDS=lexer.cc parser.cc# ignoring wildcards for `parser.cc'
+IGNORE_WILDCARDS=lexer.cc 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 engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
+
+# howto do this? info is not all that clear...
+# OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
+
 noinst_HEADERS = parser.hh
 
 #lilypond_LDADD = -llily -lflower @LEXLIB@
@@ -24,7 +28,7 @@ lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower
 
 lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 
-INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
+INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
 
@@ -42,13 +46,16 @@ parser.hh: parser.yy
        mv $<.tab.h $@
        mv $<.tab.c $(shell basename $@ .hh).cc
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index f5050d47d044557b31c34355970cf829a94e00de..35e6cd2e65a43d92c91c61a312451058b74bcd6e 100644 (file)
@@ -11,8 +11,14 @@ SUBDIRS = include
 bin_PROGRAMS = lilypond
 
 nowildcard: lexer.cc parser.cc
+
 lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
+
+# howto do this? info is not all that clear...
+# OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
+
 noinst_HEADERS = parser.hh
 
 #lilypond_LDADD = -llily -lflower @LEXLIB@
@@ -20,7 +26,7 @@ lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower
 
 lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 
-INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
+INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
 
@@ -38,11 +44,14 @@ parser.hh: parser.yy
        mv $<.tab.h $@
        mv $<.tab.c $(shell basename $@ .hh).cc
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
index f847d9f7f35dc906ca50c595138731c10e48fbef..42387989afcecbb925c781c982f212b6b26a5f52 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./lily/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter # title     makefile for lilypond
 # file    lily/Makefile.am.wild
@@ -68,14 +66,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -83,6 +82,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -97,6 +97,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -110,9 +111,15 @@ SUBDIRS = include
 bin_PROGRAMS = lilypond
 
 # ignoring wildcards for `lexer.cc'
-# ignoring wildcards for `parser.cc'
-
+IGNORE_WILDCARDS=lexer.cc parser.cc# ignoring wildcards for `parser.cc'
+IGNORE_WILDCARDS=lexer.cc 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 engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
+
+# howto do this? info is not all that clear...
+# OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
+
 noinst_HEADERS = parser.hh
 
 #lilypond_LDADD = -llily -lflower @LEXLIB@
@@ -120,17 +127,16 @@ lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower
 
 lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 
-INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
+INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../lib
-LDFLAGS = @LDFLAGS@
+DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
 LIBS = @LIBS@
 lilypond_OBJECTS =  abbrev.o abbreviation-beam-engraver.o \
 abbreviation-beam.o atom.o audio-column.o audio-element.o audio-item.o \
@@ -376,296 +382,41 @@ distdir: $(DISTFILES)
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.hh \
+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 \
-       ../flower/include/interval.hh ../flower/include/compare.hh \
-       include/offset.hh include/axes.hh ../flower/include/string.hh \
+       include/request.hh ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/beam.hh include/directional-spanner.hh \
-       include/spanner.hh include/rod.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/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.cc \
-       ../lib/include/duration-convert.hh ../lib/include/duration.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
+       ../flower/include/international.hh ../flower/include/compare.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 \
-       include/time-description.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/abbreviation-beam-engraver.hh \
-       include/engraver.hh include/request.hh \
        ../flower/include/virtual-methods.hh ../lib/include/input.hh \
        include/music.hh include/minterval.hh \
        ../flower/include/interval.hh include/direction.hh \
+       ../lib/include/duration.hh ../lib/include/plet.hh \
+       include/command-request.hh ../flower/include/varray.hh \
+       include/local-key-grav.hh include/engraver.hh \
        include/score-elem-info.hh ../flower/include/scalar.hh \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/drul-array.hh \
-       include/stem.hh include/item.hh include/boxes.hh \
+       ../flower/include/parray.hh include/key.hh \
+       include/local-key-item.hh include/item.hh include/boxes.hh \
        include/offset.hh include/axes.hh include/score-elem.hh \
        ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/molecule.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/abbreviation-beam.hh include/beam.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/rod.hh include/musical-request.hh include/misc.hh \
-       include/grouping.hh
-abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh include/dimen.hh \
-       include/abbreviation-beam.hh include/beam.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/misc.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/scalar.hh \
-       include/grouping.hh include/minterval.hh include/debug.hh \
+       include/graphical-element.hh include/drul-array.hh \
+       include/key-grav.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/atom.hh include/molecule.hh include/leastsquares.hh \
-       include/stem.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
-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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/tex.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.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 \
-       ../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/lily-proto.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/arithmetic-operator.hh include/audio-item.hh \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/audio-element.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.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/audio-item.hh \
-       include/audio-element.hh ../flower/include/virtual-methods.hh \
-       include/midi-item.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/request.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.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 \
-       ../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/lily-proto.hh include/audio-element.hh \
-       ../flower/include/virtual-methods.hh include/audio-item.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/midi-item.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.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/virtual-methods.hh \
-       ../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.cc \
-       include/axis-group-element.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh
-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 \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh
-axis-group-spanner.o: axis-group-spanner.cc \
-       include/axis-group-spanner.hh include/spanner.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh \
-       include/axis-group-element.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-item.hh \
+       include/key-item.hh include/tie.hh include/bow.hh \
+       include/directional-spanner.hh include/spanner.hh \
+       include/rod.hh include/note-head.hh include/rhythmic-head.hh \
+       include/time-description.hh include/engraver-group.hh \
        ../flower/include/plist.hh ../flower/include/list.hh \
        ../flower/include/list.icc ../flower/include/cursor.hh \
        ../flower/include/link.hh ../flower/include/link.icc \
        ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc
-axis.o: axis.cc include/axes.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/bar-column.hh \
-       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/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/script.hh include/staff-side.hh include/bar.hh
-bar-column.o: bar-column.cc include/bar.hh include/item.hh \
-       include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/bar-column.hh \
-       include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh
-bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \
+       ../flower/include/iterate.hh ../flower/include/plist.icc \
+       include/translator-group.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 \
@@ -680,198 +431,34 @@ bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \
        include/score-elem-info.hh ../flower/include/scalar.hh \
        include/staff-info.hh include/translator.hh \
        ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/bar.hh include/item.hh \
+       ../flower/include/parray.hh include/time-description.hh \
+       include/grouping.hh include/meter.hh include/item.hh \
        include/boxes.hh include/offset.hh include/axes.hh \
        include/score-elem.hh ../flower/include/directed-graph.hh \
        include/graphical-element.hh include/drul-array.hh \
        include/command-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/time-description.hh \
-       include/engraver-group.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/translator-group.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/script.hh \
-       include/staff-side.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/text-def.hh include/general-script-def.hh \
-       include/command-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/bar.hh \
-       include/time-description.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/molecule.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/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/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.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 \
-       include/time-description.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/beam-grav.hh \
-       include/engraver.hh include/request.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/drul-array.hh \
-       include/stem.hh include/item.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/molecule.hh \
+       ../lib/include/plet.hh include/timing-grav.hh \
+       include/timing-translator.hh include/engraver-group.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/beam.hh include/directional-spanner.hh \
-       include/spanner.hh include/rod.hh include/musical-request.hh \
-       include/grouping.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh
-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 \
-       ../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 \
-       ../flower/include/virtual-methods.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 \
-       include/musical-request.hh include/request.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh
-beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh include/dimen.hh \
-       include/beam.hh include/directional-spanner.hh \
-       include/spanner.hh include/abbreviation-beam.hh include/misc.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/scalar.hh include/grouping.hh \
-       include/minterval.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/atom.hh include/molecule.hh include/leastsquares.hh \
-       include/stem.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 include/main.hh
-bow.o: bow.cc include/bow.hh include/directional-spanner.hh \
-       include/spanner.hh include/lily-proto.hh \
+       include/translator-group.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 include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh ../flower/include/plist.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 ../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.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.cc include/break-align-item.hh \
-       include/horizontal-align-item.hh include/item.hh \
-       include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh
-break.o: break.cc include/score-column.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/varray.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/compare.hh \
+       ../flower/include/plist.icc include/col-info.hh \
+       ../flower/include/pointer.hh ../flower/include/assoc.hh \
+       include/colhpos.hh ../lib/include/moment.hh \
+       ../flower/include/rational.hh \
        ../flower/include/arithmetic-operator.hh include/p-col.hh \
        include/horizontal-group-item.hh \
        include/horizontal-group-elem.hh include/axis-group-element.hh \
@@ -881,3735 +468,17 @@ break.o: break.cc include/score-column.hh include/lily-proto.hh \
        include/graphical-element.hh include/offset.hh include/axes.hh \
        ../flower/include/string.hh ../flower/include/string-handle.hh \
        ../flower/include/international.hh \
-       ../flower/include/interval.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
        include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh include/break.hh \
-       include/colhpos.hh include/paper-def.hh \
-       include/music-output-def.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/line-spacer.hh \
-       ../flower/include/vector.hh include/debug.hh \
+       include/direction.hh include/rod.hh include/debug.hh \
        ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/scoreline.hh include/spanner.hh include/p-score.hh \
-       include/music-output.hh ../flower/include/cpu-timer.hh
-change-iterator.o: change-iterator.cc include/change-iterator.hh \
-       include/music-iterator.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/translator.hh \
-       ../flower/include/scalar.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/parray.hh \
-       ../lib/include/input.hh include/change-translator.hh \
-       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.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.hh include/translator.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 \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/chord-iterator.hh \
-       include/music-iterator.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-list.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.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 \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/clef-grav.hh \
-       ../flower/include/scalar.hh include/engraver.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh include/staff-info.hh \
-       include/translator.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/clef-item.hh \
-       include/debug.hh ../flower/include/dstream.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.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/molecule.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/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
-       include/clef-grav.hh include/engraver.hh include/request.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.cc include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh include/col-info.hh \
-       ../flower/include/pointer.hh ../flower/include/assoc.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-colhpos.o: colhpos.cc include/colhpos.hh ../flower/include/varray.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       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.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 \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/collision-grav.hh include/engraver.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/collision.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/collision.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 \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/note-column.hh include/script-column.hh \
-       include/note-head.hh include/rhythmic-head.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh
-command-request.o: command-request.cc include/command-request.hh \
-       include/request.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       ../lib/include/proto.hh include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/lily-proto.hh \
-       include/direction.hh ../flower/include/varray.hh \
-       ../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.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 \
-       include/dimen.hh include/crescendo.hh include/staff-side.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/spanner.hh \
-       include/drul-array.hh include/rod.hh include/lookup.hh \
-       include/atom.hh ../flower/include/scalar.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/score-column.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh
-debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \
-       ../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 ../flower/include/flower-debug.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/main.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 \
-       ../flower/include/international.hh ../flower/include/compare.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.cc \
-       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 ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh
-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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/dot-column.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/rhythmic-head.hh
-dots.o: dots.cc include/dots.hh include/item.hh include/boxes.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/interval.hh ../flower/include/compare.hh \
-       include/offset.hh include/axes.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/molecule.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/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.hh ../flower/include/scalar.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 \
-       ../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 include/crescendo.hh \
-       include/staff-side.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/spanner.hh include/drul-array.hh include/rod.hh \
-       include/dynamic-grav.hh include/engraver.hh include/request.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../lib/include/input.hh include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/musical-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/text-item.hh include/text-def.hh \
-       include/general-script-def.hh include/item.hh include/boxes.hh \
-       include/lookup.hh include/atom.hh include/paper-def.hh \
-       include/music-output-def.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/score-column.hh \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/staff-sym.hh include/note-column.hh \
-       include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh
-elem-group.o: elem-group.cc include/elem-group.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-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 \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/translator-group.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       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.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 \
-       ../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/musical-request.hh \
-       include/request.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/engraver.hh ../flower/include/varray.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/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.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 \
-       ../flower/include/virtual-methods.hh include/direction.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 include/atom.hh include/boxes.hh \
-       ../flower/include/interval.hh include/offset.hh include/axes.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.hh include/translator.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 \
-       ../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/rational.hh ../flower/include/pqueue.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 \
-       ../flower/include/assoc.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/arithmetic-operator.hh include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/warn.hh \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/p-score.hh \
-       include/music-output.hh include/paper-def.hh \
-       include/music-output-def.hh ../flower/include/dictionary.hh
-graphical-element.o: graphical-element.cc include/graphical-element.hh \
-       include/offset.hh ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       ../flower/include/virtual-methods.hh \
-       include/axis-group-element.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/directed-graph.hh \
-       include/axis-group-administration.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.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.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 \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/head-grav.hh include/engraver.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/paper-def.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/musical-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/dots.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/dictionary-iter.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.cc \
-       include/horizontal-align-item.hh include/item.hh \
-       include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh
-horizontal-group-elem.o: horizontal-group-elem.cc \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh
-horizontal-vertical-group-elem.o: horizontal-vertical-group-elem.cc \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-group-elem.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/p-col.hh include/horizontal-group-item.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/rod.hh
-idealspacing.o: idealspacing.cc include/idealspacing.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh include/p-score.hh \
-       include/colhpos.hh include/music-output.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh
-identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \
-       ../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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/paper-def.hh ../flower/include/interval.hh \
-       include/score.hh ../lib/include/input.hh \
-       ../flower/include/parray.hh include/identifier.hh \
-       include/my-lily-lexer.hh ../lib/include/includable-lexer.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/symtable.hh include/atom.hh \
-       include/boxes.hh include/offset.hh include/axes.hh \
-       include/lookup.hh ../flower/include/scalar.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.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 \
-       ../flower/include/vector.hh include/qlpsolve.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh ../flower/include/choleski.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 \
-       ../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/music-output.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/item.hh include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/direction.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/rod.hh include/spanner.hh
-key-grav.o: key-grav.cc include/key-grav.hh include/engraver.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/key.hh include/key-item.hh \
-       include/item.hh include/boxes.hh include/offset.hh \
-       include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/command-request.hh ../lib/include/duration.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.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 \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/key.hh ../flower/include/scalar.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/molecule.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/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.hh include/key-grav.hh \
-       include/engraver.hh include/request.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh include/staff-info.hh \
-       include/translator.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/command-request.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/audio-item.hh include/audio-element.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.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.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 \
-       ../flower/include/string-convert.hh include/my-lily-lexer.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/varray.hh ../lib/include/includable-lexer.hh \
-       ../lib/include/duration.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/plet.hh \
-       ../flower/include/interval.hh parser.hh include/debug.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.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/my-lily-lexer.hh \
-       include/lily-proto.hh ../flower/include/varray.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       ../lib/include/includable-lexer.hh ../lib/include/duration.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../lib/include/plet.hh include/debug.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.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 \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh \
-       include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-       include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/vertical-group-elem.hh include/command-request.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/bar.hh include/item.hh include/boxes.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/line-group-grav.hh \
-       include/engraver.hh include/score-elem-info.hh \
-       ../flower/include/scalar.hh include/staff-info.hh \
-       include/translator.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-item.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc
-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
-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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/command-request.hh ../flower/include/varray.hh \
-       include/local-key-grav.hh include/engraver.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/key.hh \
-       include/local-key-item.hh include/item.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/key-grav.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/key-item.hh include/tie.hh include/bow.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/rod.hh include/note-head.hh include/rhythmic-head.hh \
-       include/time-description.hh
-local-key-item.o: local-key-item.cc include/dimen.hh \
-       ../flower/include/real.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/local-key-item.hh include/item.hh include/boxes.hh \
-       ../flower/include/interval.hh include/offset.hh include/axes.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/molecule.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/scalar.hh include/lookup.hh include/atom.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/musical-request.hh include/request.hh \
-       ../lib/include/input.hh include/music.hh include/minterval.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.cc include/lookup.hh 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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/scalar.hh \
-       include/direction.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/symtable.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/dimen.hh include/tex.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.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/main.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 \
-       include/request.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/musical-request.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/text-item.hh include/text-def.hh \
-       include/general-script-def.hh include/item.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/staff-side.hh include/paper-def.hh \
-       include/music-output-def.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/lookup.hh include/atom.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/text-def.hh \
-       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.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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/main.hh \
-       ../flower/include/path.hh ../lib/config.hh \
-       ../lib/include/source.hh include/debug.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.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/time-description.hh \
-       include/grouping.hh include/meter.hh include/item.hh \
-       include/boxes.hh include/offset.hh include/axes.hh \
-       include/score-elem.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/command-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/timing-grav.hh \
-       include/timing-translator.hh include/engraver-group.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/translator-group.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/command-request.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/audio-item.hh include/audio-element.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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/molecule.hh include/lily-proto.hh \
-       ../lib/include/proto.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/boxes.hh \
-       ../flower/include/interval.hh include/offset.hh include/axes.hh \
-       include/direction.hh include/meter.hh include/item.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/drul-array.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.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 \
-       ../flower/include/international.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/midi-def.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/translator.hh \
-       ../flower/include/parray.hh ../lib/include/input.hh \
-       include/performance.hh include/music-output.hh \
-       ../flower/include/assoc-iter.hh include/score-performer.hh \
-       include/performer-group-performer.hh include/performer.hh \
-       include/request.hh include/music.hh include/direction.hh \
-       include/score-elem-info.hh include/staff-info.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.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 \
-       ../lib/include/warn.hh include/misc.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/scalar.hh \
-       include/grouping.hh include/minterval.hh \
-       ../flower/include/interval.hh ../flower/include/varray.hh \
-       ../flower/include/string-convert.hh include/command-request.hh \
-       include/request.hh ../flower/include/virtual-methods.hh \
-       ../lib/include/input.hh include/music.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.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.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 \
-       ../flower/include/string-convert.hh include/main.hh \
-       include/lily-proto.hh ../lib/include/proto.hh include/misc.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/scalar.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/midi-item.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../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.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 \
-       ../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/pqueue.hh ../flower/include/varray.hh \
-       include/lily-proto.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/arithmetic-operator.hh \
-       include/audio-column.hh include/audio-item.hh \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/audio-element.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.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/misc.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/scalar.hh \
-       include/grouping.hh include/minterval.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/molecule.hh \
-       include/lily-proto.hh ../lib/include/proto.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/boxes.hh include/offset.hh include/axes.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/music-list.hh include/music.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../lib/include/moment.hh ../flower/include/rational.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/music-iterator.hh ../flower/include/varray.hh \
-       include/voice-iterator.hh include/property-iterator.hh \
-       include/chord-iterator.hh include/request-iterator.hh \
-       include/translator-group.hh include/translator.hh \
-       ../flower/include/scalar.hh ../flower/include/dictionary.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.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/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/music-list.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
-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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/global-translator.hh include/translator-group.hh \
-       include/translator.hh ../flower/include/scalar.hh \
-       ../flower/include/parray.hh ../lib/include/input.hh \
-       ../flower/include/rational.hh ../flower/include/pqueue.hh \
-       ../flower/include/dictionary-iter.hh \
-       ../flower/include/assoc-iter.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 \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/misc.hh ../flower/include/scalar.hh include/grouping.hh \
-       ../flower/include/varray.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/script-def.hh include/general-script-def.hh \
-       include/text-def.hh include/music-list.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
-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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/varray.hh ../flower/include/interval.hh \
-       include/identifier.hh ../lib/include/input.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/assoc-iter.hh parser.hh include/keyword.hh \
-       include/my-lily-lexer.hh ../lib/include/includable-lexer.hh \
-       ../lib/include/duration.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/plet.hh \
-       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.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 \
-       ../lib/include/input.hh include/my-lily-lexer.hh \
-       ../lib/include/includable-lexer.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/main.hh include/music-list.hh include/music.hh \
-       ../flower/include/virtual-methods.hh include/minterval.hh \
-       ../flower/include/interval.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/musical-request.hh \
-       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.cc include/dot-column.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/note-column.hh \
-       include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/script.hh \
-       include/staff-side.hh include/note-head.hh \
-       include/rhythmic-head.hh include/stem.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/molecule.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/rest.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.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 \
-       ../flower/include/international.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/dots.hh include/item.hh \
-       include/boxes.hh include/offset.hh include/axes.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/direction.hh include/note-head.hh \
-       include/rhythmic-head.hh include/dimen.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/paper-def.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.hh include/molecule.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.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/musical-request.hh \
-       ../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.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/includable-lexer.hh ../lib/include/duration.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../lib/include/plet.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/musical-request.hh include/request.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/command-request.hh include/music-list.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/identifier.hh include/text-def.hh \
-       include/general-script-def.hh include/parseconstruct.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/varray.hh ../flower/include/pointer.tcc \
-       include/musical-request.hh include/request.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.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.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 \
-       include/molecule.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/boxes.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.cc include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh include/p-score.hh \
-       include/colhpos.hh include/music-output.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh
-p-score.o: p-score.cc include/main.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh 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 include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/lookup.hh include/atom.hh include/boxes.hh \
-       ../flower/include/scalar.hh include/direction.hh \
-       include/spanner.hh include/drul-array.hh include/rod.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/scoreline.hh include/colhpos.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/p-score.hh include/music-output.hh \
-       include/tex-stream.hh include/header.hh include/word-wrap.hh \
-       include/break.hh include/gourlay-breaking.hh \
-       include/outputter.hh ../flower/include/list.tcc \
-       ../flower/include/cursor.tcc
-paper-def.o: paper-def.cc ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/misc.hh include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/scalar.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       include/paper-def.hh include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/lookup.hh include/atom.hh \
-       include/boxes.hh include/offset.hh include/axes.hh \
-       include/direction.hh include/dimen.hh \
-       ../flower/include/assoc-iter.hh include/score-grav.hh \
-       include/engraver-group.hh ../flower/include/parray.hh \
-       include/score-elem-info.hh include/engraver.hh \
-       include/request.hh ../lib/include/input.hh include/music.hh \
-       include/staff-info.hh include/translator.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.cc ../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 \
-       include/translation-property.hh include/music.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       ../lib/include/proto.hh include/minterval.hh \
-       ../flower/include/interval.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/lily-proto.hh \
-       include/script-def.hh include/general-script-def.hh \
-       include/direction.hh include/symtable.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/varray.hh include/atom.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/lookup.hh \
-       include/misc.hh include/grouping.hh include/my-lily-lexer.hh \
-       ../lib/include/includable-lexer.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/paper-def.hh \
-       include/music-output-def.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/midi-def.hh include/main.hh \
-       include/keyword.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/parseconstruct.hh include/dimen.hh \
-       include/identifier.hh include/command-request.hh \
-       include/request.hh include/musical-request.hh \
-       include/my-lily-parser.hh include/text-def.hh \
-       include/translator-group.hh include/translator.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh ../flower/include/string-convert.hh \
-       include/main.hh include/midi-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/midi-item.hh include/midi-stream.hh \
-       include/audio-column.hh include/audio-staff.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.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 \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/translator-group.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.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 \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/translator-group.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/note-head.hh \
-       include/rhythmic-head.hh include/item.hh include/boxes.hh \
-       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.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/plet-engraver.hh include/engraver.hh \
-       ../flower/include/varray.hh include/score-elem-info.hh \
-       ../flower/include/scalar.hh include/staff-info.hh \
-       include/translator.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/parray.hh \
-       include/drul-array.hh include/plet-spanner.hh include/bow.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/score-elem.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/rod.hh include/text-def.hh \
-       include/general-script-def.hh include/beam.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/score-column.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/stem.hh \
-       include/molecule.hh
-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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/lookup.hh ../flower/include/scalar.hh \
-       include/direction.hh include/molecule.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/drul-array.hh include/rod.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/plet-spanner.hh include/bow.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/stem.hh include/text-def.hh \
-       include/general-script-def.hh ../lib/include/input.hh
-plet-swallow-engraver.o: plet-swallow-engraver.cc \
-       include/musical-request.hh include/lily-proto.hh \
-       ../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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/plet-swallow-engraver.hh include/swallow-grav.hh \
-       include/engraver.hh ../flower/include/varray.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh
-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 \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/break-align-item.hh \
-       include/horizontal-align-item.hh \
-       include/priority-halign-grav.hh include/engraver.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/score-priority-grav.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 \
-       ../lib/include/input.hh include/minterval.hh \
-       ../flower/include/interval.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/scalar.hh \
-       include/translator-group.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.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 \
-       ../flower/include/compare.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/scalar.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/lookup.hh include/atom.hh \
-       include/boxes.hh include/offset.hh include/axes.hh \
-       include/direction.hh include/molecule.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/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/paper-def.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/string-convert.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 \
-       ../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 include/qlp.hh \
-       include/ineq-constrained-qp.hh ../flower/include/matrix.hh \
-       ../flower/include/matrix-storage.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/vector.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 \
-       ../flower/include/vector.hh include/qlpsolve.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh ../flower/include/choleski.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.hh include/translator.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 \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/request-iterator.hh \
-       include/music-iterator.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-list.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/request.hh \
-       include/direction.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       ../lib/include/proto.hh include/music.hh include/minterval.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/rest-collision.hh \
-       include/item.hh include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.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/drul-array.hh \
-       include/direction.hh include/rest-collision-grav.hh \
-       include/engraver.hh include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/collision.hh include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/note-column.hh include/script-column.hh
-rest-collision.o: rest-collision.cc include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
-       ../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 include/rest-collision.hh \
-       include/item.hh include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.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/drul-array.hh \
-       include/direction.hh include/note-column.hh \
-       include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/stem.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/molecule.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../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/note-head.hh include/rhythmic-head.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.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/musical-request.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/dots.hh include/item.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/rest.hh include/rhythmic-head.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 \
-       ../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 \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/varray.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
-       include/rest.hh include/rhythmic-head.hh include/item.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.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.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 \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/note-head.hh \
-       include/rhythmic-head.hh include/item.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/stem.hh include/molecule.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/note-column.hh \
-       include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/script.hh include/staff-side.hh include/dot-column.hh \
-       include/horizontal-group-item.hh
-rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \
-       include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/molecule.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/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/lookup.hh include/atom.hh \
-       ../flower/include/scalar.hh include/rest.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
-rod.o: rod.cc include/rod.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/direction.hh \
-       include/drul-array.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh
-score-bar.o: score-bar.cc include/score-bar.hh include/bar.hh \
-       include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh
-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 \
-       ../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 include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh \
-       include/score-column.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh
-score-elem-info.o: score-elem-info.cc include/score-elem-info.hh \
-       ../flower/include/scalar.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../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 \
-       ../flower/include/varray.hh include/request.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh
-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 \
-       ../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/music-output.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/interval.hh include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh include/atom.hh include/boxes.hh \
-       include/offset.hh include/axes.hh ../flower/include/scalar.hh \
-       include/direction.hh include/molecule.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/tex.hh include/dimen.hh include/spanner.hh \
-       include/drul-array.hh include/rod.hh include/scoreline.hh \
-       include/item.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh
-score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh include/scoreline.hh \
-       include/colhpos.hh include/spanner.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/item.hh include/boxes.hh include/score-grav.hh \
-       include/engraver-group.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/score-elem-info.hh \
-       ../flower/include/scalar.hh include/engraver.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh include/staff-info.hh \
-       include/translator.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/translator-group.hh \
-       include/global-translator.hh ../flower/include/pqueue.hh \
-       include/p-score.hh include/music-output.hh \
-       include/musical-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/score-column.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/command-request.hh include/paper-def.hh \
-       include/music-output-def.hh
-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 \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/translator-group.hh include/global-translator.hh \
-       ../flower/include/pqueue.hh include/midi-def.hh \
-       include/music-output-def.hh include/audio-column.hh \
-       include/audio-item.hh include/audio-element.hh \
-       include/performance.hh include/music-output.hh \
-       include/midi-stream.hh ../flower/include/string-convert.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../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.cc \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/score-priority-grav.hh \
-       include/engraver.hh include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/assoc-iter.hh include/break-align-item.hh \
-       include/horizontal-align-item.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 \
-       ../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/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/input.hh \
-       ../flower/include/parray.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/music-output.hh ../lib/include/source.hh \
-       ../lib/include/source-file.hh include/music-iterator.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/global-translator.hh \
-       include/translator-group.hh include/translator.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.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 \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/dimen.hh \
-       include/atom.hh include/boxes.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/p-score.hh include/music-output.hh
-scores.o: scores.cc include/main.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/score.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 \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/input.hh \
-       ../flower/include/parray.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/interval.hh include/music-output-def.hh \
-       ../flower/include/virtual-methods.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.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 \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/script.hh include/staff-side.hh \
-       include/note-head.hh include/rhythmic-head.hh include/stem.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/molecule.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../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
-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 \
-       ../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 include/script-def.hh \
-       include/general-script-def.hh ../lib/include/input.hh \
-       ../flower/include/virtual-methods.hh include/direction.hh \
-       include/atom.hh include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/varray.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh ../flower/include/scalar.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/script.hh \
-       include/staff-side.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/musical-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/stem.hh include/molecule.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/staff-sym.hh include/spanner.hh include/rod.hh \
-       include/general-script-def.hh
-script.o: script.cc include/script-def.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/general-script-def.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../lib/include/input.hh \
-       ../flower/include/virtual-methods.hh include/direction.hh \
-       include/musical-request.hh include/request.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/paper-def.hh \
-       ../flower/include/varray.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/script.hh include/staff-side.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/stem.hh include/molecule.hh include/lookup.hh \
-       include/atom.hh ../flower/include/scalar.hh
-separating-group-spanner.o: separating-group-spanner.cc \
-       include/separating-group-spanner.hh \
-       include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-       include/spanner.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh \
-       include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/vertical-group-elem.hh \
-       include/single-malt-grouping-item.hh include/item.hh \
-       include/boxes.hh
-separating-line-group-grav.o: separating-line-group-grav.cc \
-       include/separating-line-group-grav.hh \
-       include/line-group-grav.hh include/engraver.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/separating-group-spanner.hh \
-       include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-       include/spanner.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/drul-array.hh include/rod.hh \
-       include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/vertical-group-elem.hh \
-       include/single-malt-grouping-item.hh include/item.hh \
-       include/boxes.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-item.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc
-single-malt-grouping-item.o: single-malt-grouping-item.cc \
-       include/single-malt-grouping-item.hh include/item.hh \
-       include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/rod.hh
-slur-grav.o: slur-grav.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../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/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 ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/slur-grav.hh include/engraver.hh \
-       ../flower/include/varray.hh include/score-elem-info.hh \
-       ../flower/include/scalar.hh include/staff-info.hh \
-       include/translator.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/parray.hh \
-       include/slur.hh include/directional-spanner.hh \
-       include/spanner.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/drul-array.hh include/rod.hh include/bow.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/note-column.hh include/item.hh \
-       include/boxes.hh include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh
-slur.o: slur.cc include/slur.hh include/directional-spanner.hh \
-       include/spanner.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/bow.hh \
-       ../flower/include/scalar.hh include/lookup.hh include/atom.hh \
-       include/boxes.hh include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/note-column.hh include/item.hh include/script-column.hh \
-       include/horizontal-vertical-group-item.hh \
-       include/axis-group-item.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/horizontal-vertical-group-elem.hh \
-       include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-       include/stem.hh include/molecule.hh include/p-col.hh \
-       include/horizontal-group-item.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh
-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 \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/span-bar-grav.hh \
-       include/engraver.hh include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/vertical-align-spanner.hh include/spanner.hh \
-       include/rod.hh include/vertical-align-elem.hh
-span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/span-bar.hh include/bar.hh include/item.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/lookup.hh include/atom.hh \
-       ../flower/include/scalar.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/molecule.hh \
-       include/vertical-align-elem.hh
-span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.hh \
-       include/span-bar.hh include/bar.hh include/item.hh \
-       include/boxes.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/score-bar.hh \
-       include/span-score-bar-grav.hh include/span-bar-grav.hh \
-       include/engraver.hh include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh
-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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh include/score-bar.hh include/atom.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/lookup.hh ../flower/include/scalar.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/spanner.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/p-score.hh \
-       include/colhpos.hh include/music-output.hh include/outputter.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 ../flower/include/assoc.hh \
-       include/colhpos.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/arithmetic-operator.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/qlp.hh include/ineq-constrained-qp.hh \
-       ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \
-       ../flower/include/unionfind.hh include/idealspacing.hh \
-       ../flower/include/pointer.tcc include/score-column.hh \
-       include/paper-def.hh include/music-output-def.hh \
-       ../flower/include/dictionary.hh include/dimen.hh \
-       include/main.hh
-staff-info.o: staff-info.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../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/staff-info.hh \
-       include/lily-proto.hh include/score-column.hh \
-       ../flower/include/varray.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/arithmetic-operator.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh
-staff-performer.o: staff-performer.cc include/staff-performer.hh \
-       include/performer-group-performer.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../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 \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/translator-group.hh include/debug.hh \
-       ../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.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/varray.hh include/music-output-def.hh \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/dimen.hh \
-       include/staff-side.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/direction.hh include/staff-sym.hh include/spanner.hh \
-       include/drul-array.hh include/rod.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh
-staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \
-       include/engraver.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh ../flower/include/varray.hh \
-       include/request.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/staff-sym.hh \
-       include/spanner.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/drul-array.hh include/rod.hh include/score.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh
-staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/lookup.hh \
-       include/atom.hh include/boxes.hh ../flower/include/scalar.hh \
-       include/paper-def.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-output-def.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/molecule.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/dimen.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 \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/note-head.hh \
-       include/rhythmic-head.hh include/item.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/score-elem.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/stem.hh include/molecule.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/musical-request.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.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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/misc.hh include/lily-proto.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/scalar.hh \
-       include/grouping.hh include/minterval.hh \
-       ../flower/include/interval.hh ../flower/include/varray.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/atom.hh include/boxes.hh \
-       include/offset.hh include/axes.hh include/stem.hh \
-       include/item.hh include/score-elem.hh \
-       ../flower/include/parray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/direction.hh include/molecule.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/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.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/drul-array.hh \
-       include/direction.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/molecule.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/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/paper-def.hh \
-       include/music-output-def.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/note-head.hh \
-       include/rhythmic-head.hh include/lookup.hh include/atom.hh \
-       ../flower/include/scalar.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/rod.hh include/misc.hh include/grouping.hh \
-       include/minterval.hh include/beam.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/rest.hh
-super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh include/scoreline.hh \
-       include/colhpos.hh include/spanner.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/p-score.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../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.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 \
-       include/request.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh
-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 \
-       include/request.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh
-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 \
-       ../flower/include/international.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/dimen.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       include/atom.hh include/boxes.hh include/offset.hh \
-       include/axes.hh ../flower/include/assoc.hh \
-       ../flower/include/assoc-iter.hh include/symtable.hh \
-       ../flower/include/dictionary.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 \
-       ../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/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/musical-request.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/spanner.hh ../flower/include/pcursor.tcc \
-       ../flower/include/plist.tcc
-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/pcursor.tcc \
-       ../flower/include/pcursor.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/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/plist.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/molecule.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/direction.hh ../flower/include/pcursor.tcc \
-       ../flower/include/plist.tcc
-template4.o: template4.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/pcursor.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/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/cursor.tcc \
-       ../flower/include/list.tcc ../flower/include/pcursor.tcc \
-       ../flower/include/plist.tcc
-template5.o: template5.cc ../lib/include/proto.hh \
-       ../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 \
-       ../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.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 \
-       ../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 \
-       ../flower/include/virtual-methods.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.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/pcursor.tcc \
-       ../flower/include/plist.tcc include/music-list.hh \
-       include/music.hh ../flower/include/virtual-methods.hh \
-       ../lib/include/input.hh include/minterval.hh \
-       ../flower/include/interval.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-iterator.hh \
-       ../flower/include/varray.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 \
-       ../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/audio-item.hh \
-       include/lily-proto.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh include/audio-element.hh \
-       ../flower/include/virtual-methods.hh include/audio-column.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/midi-item.hh ../flower/include/pcursor.tcc \
-       ../flower/include/plist.tcc
-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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh include/lily-proto.hh \
-       ../lib/include/proto.hh include/molecule.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/direction.hh include/tex.hh ../flower/include/scalar.hh \
-       include/symtable.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/lookup.hh include/misc.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/grouping.hh include/minterval.hh include/paper-def.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/string-convert.hh include/main.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 \
-       ../flower/include/international.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       ../flower/include/varray.hh include/lookup.hh include/atom.hh \
-       include/boxes.hh include/offset.hh include/axes.hh \
-       include/direction.hh include/molecule.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/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/paper-def.hh \
-       include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/string-convert.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh ../flower/include/scalar.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.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 \
-       include/tex.hh include/boxes.hh ../flower/include/interval.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../lib/include/warn.hh include/lookup.hh include/atom.hh \
-       include/boxes.hh ../flower/include/interval.hh \
-       include/offset.hh include/axes.hh ../flower/include/scalar.hh \
-       include/direction.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/varray.hh include/music-output-def.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/molecule.hh \
-       include/text-def.hh include/general-script-def.hh \
-       ../lib/include/input.hh include/dimen.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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       include/paper-def.hh ../flower/include/varray.hh \
-       include/music-output-def.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/text-item.hh \
-       include/text-def.hh include/general-script-def.hh \
-       include/item.hh include/boxes.hh include/offset.hh \
-       include/axes.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/drul-array.hh \
-       include/staff-side.hh include/stem.hh include/molecule.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.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 \
-       include/text-spanner.hh include/directional-spanner.hh \
-       include/spanner.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/drul-array.hh \
-       include/rod.hh include/text-def.hh \
-       include/general-script-def.hh ../lib/include/input.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/paper-def.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music-output-def.hh ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/atom.hh
-tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/varray.hh include/request.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       ../flower/include/parray.hh include/tie.hh include/bow.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/score-elem.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/drul-array.hh include/rod.hh include/note-head.hh \
-       include/rhythmic-head.hh include/item.hh include/boxes.hh \
-       include/musical-request.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/music-list.hh \
-       ../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
-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 \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/varray.hh ../flower/include/interval.hh \
-       include/music-output-def.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/tie.hh include/bow.hh \
-       include/directional-spanner.hh include/spanner.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/drul-array.hh include/direction.hh include/rod.hh \
-       include/note-head.hh include/rhythmic-head.hh include/item.hh \
-       include/boxes.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-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 \
-       ../flower/include/varray.hh include/debug.hh \
-       ../flower/include/dstream.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/warn.hh
-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 \
-       ../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/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 \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh \
-       ../flower/include/virtual-methods.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/translator-group.hh include/global-translator.hh \
-       ../flower/include/pqueue.hh include/timing-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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.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 \
-       include/time-description.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/grouping.hh \
-       include/minterval.hh ../flower/include/interval.hh \
-       include/command-request.hh include/request.hh include/music.hh \
-       include/direction.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/translator-group.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/global-translator.hh ../flower/include/pqueue.hh
-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 \
-       ../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/scalar.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.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 \
-       ../flower/include/virtual-methods.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 \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh ../flower/include/varray.hh \
-       include/translator-group.hh include/translator.hh \
-       ../flower/include/scalar.hh ../flower/include/parray.hh \
-       ../lib/include/input.hh include/debug.hh \
-       ../flower/include/dstream.hh ../lib/include/warn.hh \
-       ../flower/include/rational.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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.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 \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/translator-group.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       ../flower/include/dictionary-iter.hh \
-       ../flower/include/assoc-iter.hh ../flower/include/rational.hh
-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 \
-       ../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 \
-       ../flower/include/virtual-methods.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 \
-       include/musical-request.hh include/request.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.hh include/direction.hh \
-       ../lib/include/duration.hh ../lib/include/plet.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.cc \
-       include/vertical-align-elem.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh
-vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc include/rod.hh \
-       include/vertical-align-grav.hh include/engraver.hh \
-       include/request.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/input.hh \
-       include/music.hh include/minterval.hh \
-       include/score-elem-info.hh ../flower/include/scalar.hh \
-       include/staff-info.hh include/translator.hh \
-       ../flower/include/dictionary.hh ../flower/include/assoc.hh \
-       include/vertical-align-spanner.hh include/spanner.hh \
-       include/vertical-align-elem.hh include/vertical-group-elem.hh
-vertical-align-spanner.o: vertical-align-spanner.cc \
-       include/vertical-align-spanner.hh include/spanner.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh \
-       include/vertical-align-elem.hh
-vertical-group-elem.o: vertical-group-elem.cc \
-       include/vertical-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh \
-       ../flower/include/real.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/interval.hh \
-       include/axis-group-administration.hh include/item.hh \
-       include/boxes.hh include/drul-array.hh include/direction.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh
-vertical-group-spanner.o: vertical-group-spanner.cc \
-       include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-       include/spanner.hh include/lily-proto.hh \
-       ../lib/include/proto.hh ../flower/include/fproto.hh \
-       ../flower/include/real.hh include/score-elem.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       ../flower/include/virtual-methods.hh \
-       ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/interval.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh \
-       include/axis-group-element.hh \
-       include/axis-group-administration.hh \
-       include/vertical-group-elem.hh include/item.hh include/boxes.hh \
-       include/p-col.hh include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-item.hh \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc
-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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       include/lily-proto.hh ../lib/include/proto.hh \
-       ../flower/include/virtual-methods.hh include/translator.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 \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/plist.icc \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/voice-iterator.hh \
-       include/music-iterator.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/music-list.hh \
-       include/music.hh include/minterval.hh \
-       ../flower/include/interval.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 \
-       ../lib/include/warn.hh include/my-lily-lexer.hh \
-       ../flower/include/varray.hh ../lib/include/includable-lexer.hh \
-       ../lib/include/duration.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/plet.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.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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh \
-       ../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/pcursor.hh \
-       ../flower/include/cursor.icc ../flower/include/iterate.hh \
-       ../flower/include/plist.icc ../flower/include/dictionary.hh \
-       ../flower/include/assoc.hh include/p-score.hh \
-       ../flower/include/parray.hh include/music-output.hh \
-       include/debug.hh ../flower/include/dstream.hh \
-       ../lib/include/warn.hh include/p-col.hh \
-       include/horizontal-group-item.hh \
-       include/horizontal-group-elem.hh include/axis-group-element.hh \
-       include/score-elem.hh ../flower/include/directed-graph.hh \
-       include/graphical-element.hh include/offset.hh include/axes.hh \
-       include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/boxes.hh include/drul-array.hh \
-       include/direction.hh include/rod.hh include/spring-spacer.hh \
-       include/line-spacer.hh ../flower/include/vector.hh \
-       include/col-info.hh ../flower/include/pointer.hh
+       include/qlp.hh include/ineq-constrained-qp.hh \
+       ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \
+       ../flower/include/unionfind.hh include/idealspacing.hh \
+       ../flower/include/pointer.tcc include/score-column.hh \
+       include/paper-def.hh include/music-output-def.hh \
+       ../flower/include/dictionary.hh include/dimen.hh \
+       include/main.hh
 
 info: info-recursive
 dvi: dvi-recursive
@@ -4713,16 +582,19 @@ parser.hh: parser.yy
        mv $<.tab.h $@
        mv $<.tab.c $(shell basename $@ .hh).cc
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 1d1ec0f441211df262115692e5507239f01439b3..69f1b39d4152df12fca087b5b18d8817aa7abb9a 100644 (file)
@@ -1,4 +1,4 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 52
+PATCH_LEVEL = 53
 MY_PATCH_LEVEL =
index c4fe4b46af53fd41695d53255e390b3f827337bb..39523900425f9cf8c5a0e25fe4ecede3fd2efa0b 100644 (file)
@@ -35,8 +35,16 @@ bool
 Dynamic_engraver::do_try_request (Request * r)
 {
   Musical_req * m = r->musical();
-  if (!m || !m->dynamic())
+  if (!m)
     return false;
+  Dynamic_req * d = m->dynamic ();
+  if (!d)
+    return false;
+
+  if (cresc_p_ && d->span_dynamic ()
+      && d->span_dynamic ()->spantype == Span_req::START)
+    return false;
+  
   dynamic_req_l_arr_.push (m->dynamic());
   return true;
 }
diff --git a/lily/include/GNUmakefile b/lily/include/GNUmakefile
new file mode 100644 (file)
index 0000000..bee7c9c
--- /dev/null
@@ -0,0 +1,42 @@
+# lily/include/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+biltdir=../../../build/lily/include
+
+# include Makefile
+include $(biltdir)/Makefile
+
+endif
+
+# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+
+wild-check: check-noinst-headers
+
+
+check-noinst-headers:
+ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
+       @echo \"$(noinst_HEADERS)\"
+       @echo \"$(CURRENT_noinst_HEADERS)\"
+       @echo  noinst_HEADERS changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
index bcef2c017fa7d4b0e03b31a76eec4d310d3d4430..2bf88e7bca26f808fab8b46f96025a8350a1b207 100644 (file)
@@ -1,11 +1,17 @@
-# Automatically generated from ./lily/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # lily/include/Makefile.am.wild
 
 noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 3540ce17196a2fa5f7e681d88b54a55cd8256969..e3d95d51722f27443e1f35653822f3da98eedc24 100644 (file)
@@ -2,5 +2,13 @@
 
 noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
index b51e7448b831ad1947937545620df587c06fdc6f..6468eb16287d055186f490134207e73ddd6c8b56 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./lily/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # lily/include/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -101,9 +102,9 @@ absolute_builddir = @absolute_builddir@
 
 noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../lib/config.hh
+CONFIG_HEADER = ../../flower/config.hh
 CONFIG_CLEAN_FILES = 
 HEADERS =  $(noinst_HEADERS)
 
@@ -217,8 +218,16 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 49de9f82d225e91875b41ee1a4cf5438596f80a6..1602b94d9f12902d2a1926838dbab9ce3838a1dd 100644 (file)
@@ -18,6 +18,7 @@ protected:
   virtual void do_process_requests();
   virtual void acknowledge_element (Score_elem_info);
   virtual void do_pre_move_processing();
+  virtual void do_creation_processing ();
 public:
   Key local_key_;
   Key const *key_C_;
index 0a5487a13868e90b5361edcc39c99eac271f6e65..918800a7c6b72a7f5c7d848dbecb3e3f702ac17d 100644 (file)
@@ -36,7 +36,7 @@ public:
 
   void preprocess ();
   /// set a minimum distance
-  void add_rod (Paper_column * to, Real distance, Direction d);
+  void add_rod (Paper_column * to, Real distance);
   
   /** prebreak is put before end of line.
     if broken here, then (*this) column is discarded, and prebreak
index 42509d453efbcae6597b04c81c8094ce9d2b678c..c71b6b3484ebc52a8147622ed2b1669fd46df37c 100644 (file)
@@ -16,7 +16,7 @@
 struct Column_rod {
   Paper_column *other_l_;
   Real distance_f_;
-  Direction dir_;
+
   Column_rod ();
   static int compare (const Column_rod &r1, const Column_rod &r2);
   void print () const;
@@ -28,7 +28,7 @@ struct Rod
   Real distance_f_;
   void add_to_cols ();
 
-  Rod (Item*,Item*);
+  Rod (Single_malt_grouping_item*,Single_malt_grouping_item*);
   Rod ();
 };
 
index 4b7489702223661eb3aa9b9a7e53085424944be8..a220ee4c19a1f9c8a486468a37aa7f2be3bb4bf4 100644 (file)
@@ -23,12 +23,12 @@ class Single_malt_grouping_item : public Item
   Link_array<Item> item_l_arr_;
 public:
   Single_malt_grouping_item ();
-  Interval do_width () const;
+  Interval my_width () const;
   void add (Item*);
   DECLARE_MY_RUNTIME_TYPEINFO;
 protected:
   virtual  void do_substitute_dependency (Score_elem*, Score_elem*);
-
+  virtual void do_print () const;
 };
 
 #endif /* SINGLE_MALT_GROUPING_ITEM_HH */
index 7201acf173020b1664d7e2f14ceb3d23a5f5e0bd..432e4f20b0fa7dfa3fc6ed0e5b48da0401765bc4 100644 (file)
 #include "tie.hh"
 #include "note-head.hh"
 #include "time-description.hh"
+#include "engraver-group.hh"
+
 
 Local_key_engraver::Local_key_engraver()
 {
   key_C_ = 0;
 }
 
+void
+Local_key_engraver::do_creation_processing ()
+{
+  Translator * result =
+    daddy_grav_l()->get_simple_translator (Key_engraver::static_name());
+
+  if (!result)
+    {
+      warning ("Out of tune! Can't find key engraver");
+    }
+  else
+    key_C_ = &((Key_engraver*)result->engraver_l ())->key_;
+}
+
 void
 Local_key_engraver::do_pre_move_processing()
 {
@@ -48,6 +64,7 @@ Local_key_engraver::do_pre_move_processing()
                c0_i = *get_staff_info().c0_position_i_l_;      
                
              key_item_p = new Local_key_item (c0_i);
+
            }
          key_item_p->add (note_l);
          key_item_p->add_support (support_l);
@@ -85,22 +102,12 @@ Local_key_engraver::acknowledge_element (Score_elem_info info)
 
       mel_l_arr_.push (note_l);
       support_l_arr_.push (item_l);
-       
     }
   else if (info.req_l_->command()
           && info.req_l_->command()->keychange ()) 
     {
-      Key_engraver * key_grav_l =
-       (Key_engraver*)info.origin_grav_l_arr_[0];
-      key_C_ = &key_grav_l->key_;
       local_key_ = *key_C_;
     }
-  else if (elem_l->is_type_b (Key_item::static_name ())) 
-    {
-      Key_engraver * key_grav_l =
-       (Key_engraver*)info.origin_grav_l_arr_[0];
-      key_C_ = &key_grav_l->key_;
-    }
   else if (elem_l->is_type_b (Tie::static_name ())) 
     {
       Tie * tie_l = (Tie*)elem_l->spanner();
index f688baf6d59988d22d8571ddff7bfdd7893ba6df..36ba0668b9f1eaa35c85b6adcbbc51e693a540c8 100644 (file)
@@ -55,11 +55,14 @@ String
 Midi_chunk::str () const
 {
   String str = header_str_;
+  String dat = data_str ();
+  // huh, huh??
+//  String length_str = String_convert::i2hex_str (dat.length_i () 
   String length_str = String_convert::i2hex_str (data_str_.length_i () 
     + footer_str_.length_i (), 8, '0');
   length_str = String_convert::hex2bin_str (length_str);
   str += length_str;
-  str += data_str ();
+  str += dat;
   str += footer_str_;
   return str;
 }
index 898c7357ab7826525be8b7bab1d7886c03ef9dea..7da23d8d902960f4cf6cee098639fe72d32edfc8 100644 (file)
@@ -11,9 +11,9 @@
 #include "debug.hh"
 
 void
-Paper_column::add_rod (Paper_column * p, Real d, Direction dir)
+Paper_column::add_rod (Paper_column * p, Real d)
 {
-  assert( sign (p->rank_i ()  - rank_i ()) == dir);
+  Direction dir =  Direction (sign (p->rank_i ()  - rank_i ()));
   for (int i=0; i < minimal_dists_arr_drul_[dir].size (); i++)
     {
       Column_rod &rod = minimal_dists_arr_drul_[dir][i];
@@ -26,8 +26,7 @@ Paper_column::add_rod (Paper_column * p, Real d, Direction dir)
 
   Column_rod cr;
   cr.distance_f_ = d;
-  cr.other_l_ = p;
-  cr.dir_ = dir;
+       cr.other_l_ = p;
 
   minimal_dists_arr_drul_[dir].push (cr);
       
@@ -69,8 +68,13 @@ Paper_column::do_print() const
       DOUT <<'\n' << ((break_status_i_ == LEFT) ? "prebreak" : "postbreak");
       DOUT << '\n';
     }
-  // DOUT << "extent: " << width().str () << "\n";
 
+  DOUT << "Left: ";
+  for (int i=0; i < minimal_dists_arr_drul_[LEFT].size (); i++)
+    {
+      minimal_dists_arr_drul_[LEFT][i].print ();
+    }
+  DOUT << "Right: ";
   for (int i=0; i < minimal_dists_arr_drul_[RIGHT].size (); i++)
     {
       minimal_dists_arr_drul_[RIGHT][i].print ();
index 707f5572e6602f0e7a066e2fa04cb50ff8772951..f624d012532e23e75013a8ba4649dc9806b3bac4 100644 (file)
@@ -9,12 +9,13 @@
 #include "rod.hh"
 #include "p-col.hh"
 #include "debug.hh"
+#include "single-malt-grouping-item.hh"
 
-Rod::Rod (Item *l, Item *r)
+Rod::Rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
 {
   item_l_drul_[LEFT] =l;
   item_l_drul_[RIGHT]=r;
-  distance_f_ = l->width () [RIGHT] + r->width ()[LEFT];
+  distance_f_ = l->my_width () [RIGHT] + r->my_width ()[LEFT];
 }
          
 Rod::Rod ()
@@ -35,7 +36,6 @@ Column_rod::print () const
 Column_rod::Column_rod ()
 {
   distance_f_ = 0;
-  dir_ = CENTER;
   other_l_ = 0;
 }
   
@@ -48,7 +48,7 @@ void
 Rod::add_to_cols ()
 {
   item_l_drul_[RIGHT]->column_l ()->add_rod
-    (item_l_drul_[LEFT]->column_l (), distance_f_, LEFT);
+    (item_l_drul_[LEFT]->column_l (), distance_f_);
   item_l_drul_[LEFT]->column_l ()->add_rod
-    (item_l_drul_[RIGHT]->column_l (), distance_f_,RIGHT);
+    (item_l_drul_[RIGHT]->column_l (), distance_f_);
 }
index eca012b48500323dd39eaa660c55d693f35aed51..42ec3ee92c562448b409bcc17fa252d4282d00d8 100644 (file)
@@ -17,15 +17,25 @@ Separating_group_spanner::get_rods () const
 
   for (int i=0; i < spacing_unit_l_arr_.size () -1; i++)
     {
-      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));    
-      if (spacing_unit_l_arr_[i]->breakable_b_)
+      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
+      bool lb =spacing_unit_l_arr_[i]->breakable_b_;
+      if (lb)
        {
-         a.push (Rod (spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), spacing_unit_l_arr_[i+1]));
+         a.push (Rod ((Single_malt_grouping_item*) spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
+                      spacing_unit_l_arr_[i+1]));
        }
-      if (spacing_unit_l_arr_[i+1]->breakable_b_)
+      bool rb=spacing_unit_l_arr_[i+1]->breakable_b_;
+      if (rb)
        {
-         a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)));
+         a.push (Rod (spacing_unit_l_arr_[i],
+                    (Single_malt_grouping_item*)  spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)));
        }
+      if (lb && rb)
+       {
+         a.push (Rod ((Single_malt_grouping_item*)spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
+                    (Single_malt_grouping_item*)  spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)));
+       }
+       
     }
       
   return a;
@@ -45,7 +55,8 @@ Separating_group_spanner::do_substitute_dependency (Score_elem*o, Score_elem*n)
 {
   if (o->is_type_b (Single_malt_grouping_item::static_name ()))
     {
-      Single_malt_grouping_item*ns = n ? (Single_malt_grouping_item*)n->item () : 0;
+      Single_malt_grouping_item*ns = n ?
+       (Single_malt_grouping_item*)n->item () : 0;
       spacing_unit_l_arr_.substitute ((Single_malt_grouping_item*)o->item (), ns);
     }
 }
index f6975f77c50d5234c3c7a9a37f6af53241a917d5..a0b476988a6debf914629b11d72d9aecaf7f04ef 100644 (file)
@@ -9,10 +9,12 @@
 
 #include "single-malt-grouping-item.hh"
 #include "p-col.hh"
+#include "debug.hh"
 
 Single_malt_grouping_item ::Single_malt_grouping_item()
 {
   transparent_b_ = true;
+  set_empty (true);
 }
 
 void
@@ -24,7 +26,7 @@ Single_malt_grouping_item::add (Item* i)
 }
 
 Interval
-Single_malt_grouping_item::do_width () const
+Single_malt_grouping_item::my_width () const
 {
   Paper_column * pc = column_l ();
   Interval w;
@@ -35,7 +37,8 @@ Single_malt_grouping_item::do_width () const
       w.unite  (il->width () + il->relative_coordinate (pc, X_AXIS));
     }
   
-  return w + (- relative_coordinate (pc, X_AXIS)); // TODO
+  return w;
+ // add this->offset_ ? this-> relative_coordinate ()? 
 }
 
 IMPLEMENT_IS_TYPE_B1(Single_malt_grouping_item, Item);
@@ -48,3 +51,14 @@ Single_malt_grouping_item::do_substitute_dependency (Score_elem*o, Score_elem*n)
       item_l_arr_.unordered_substitute (o->item (),  n ? n->item () : 0);
     }
 }
+
+void
+Single_malt_grouping_item::do_print () const
+{
+#ifndef NDEBUG
+  for (int i=0; i < item_l_arr_.size (); i++)
+    {
+      DOUT << item_l_arr_[i]->name () << ", ";
+    }
+#endif
+}
index fffd8318df6df91f5e13d2fad1ff9eec2b6709eb..c57eaf0927ebc26577dd2fdf69f00913807eb35e 100644 (file)
@@ -149,13 +149,15 @@ Spring_spacer::check_constraints (Vector v) const
 {
   int dim=v.dim();
   assert (dim == cols.size());
-
+  DOUT << "checking " << v;
   for (int i=0; i < dim; i++)
     {
       if (cols[i].fixed_b() &&
          abs (cols[i].fixed_position() - v (i)) > COLFUDGE)
-       return false;
-
+       {
+         DOUT << "Fixpos broken\n";
+         return false;
+       }
       Array<Column_rod> &rods (cols[i].pcol_l_->minimal_dists_arr_drul_[RIGHT]);
       for (int j =0; j < rods.size (); j++)
        {
@@ -165,7 +167,11 @@ Spring_spacer::check_constraints (Vector v) const
          if (rods[j].other_l_ != cols[i + delta_idx].pcol_l_)
            continue;
          if (v (i + delta_idx) - v (i) < rods[j].distance_f_)
-           return false;
+           {
+             DOUT << "v (i + delta_idx) - v (i) too small: i, delta_idx: "
+                  << i << " " << delta_idx;
+             return false;
+           }
        }
 
     }
@@ -178,8 +184,11 @@ Vector
 Spring_spacer::try_initial_solution() const
 {
   Vector v;
-  if (try_initial_solution_and_tell (v))
-    warning ("I'm too fat; call Oprah");
+  if (!try_initial_solution_and_tell (v))
+    {
+      warning ("I'm too fat; call Oprah");
+      DOUT << "tried solution: " << v;
+    }
   return v;
 
 }
@@ -209,12 +218,14 @@ Spring_spacer::try_initial_solution_and_tell (Vector &v) const
          
          min_x = min_x >? (initsol (idx) + cr.distance_f_);
        }
+      initsol (i) = min_x;
       
       if (cols[i].fixed_b())
        {
          initsol (i)=cols[i].fixed_position();
          if (initsol (i) < min_x )
            {
+             DOUT << "failing: init, min : " << initsol (i) << " " << min_x << "\n";
              initsol (i) = min_x;
              succeeded = false;
            }
@@ -277,14 +288,11 @@ Spring_spacer::make_constraints (Mixed_qp& lp) const
          Column_rod & cr = lc->minimal_dists_arr_drul_[RIGHT][i];
          int right_rank = cr.other_l_->rank_i ();
 
-         cout << "lr, rr, last = " << my_rank << ", " <<right_rank << ", " << last_rank << endl;
 
          if (right_rank > last_rank)
            break;
              
          int right_idx = right_rank - my_rank + j;
-         cout << "li, ri = " << j << "," << right_idx;
-         cout << "lr, rr = " << my_rank << ", " <<right_rank << endl;
          c1(right_idx)=1.0 ;
          c1(j)=-1.0 ;
 
@@ -520,13 +528,14 @@ Spring_spacer::get_ruling_durations(Array<Moment> &shortest_playing_arr,
 #endif
 }
 
+/*
+  TODO: take out the refs to width
+ */
 /**
   generate springs between columns.
 
-  UNDER DESTRUCTION
-
   TODO: This needs rethinking.  Spacing should take optical
-  effects into account, and should be local (measure wide)
+  effects into account
 
   The algorithm is taken from :
 
@@ -565,7 +574,7 @@ Spring_spacer::calc_idealspacing()
          
          Moment delta_t =  scol_l (i+1)->when() - scol_l (i)->when () ;
 
-         Real k=  paper_l()->arithmetic_constant(context_shortest_arr[i]);
+         Real k=  paper_l()->arithmetic_constant (context_shortest_arr[i]);
          /*
            ugh should use shortest_playing distance
          */
@@ -603,7 +612,7 @@ Spring_spacer::calc_idealspacing()
          Moment delta_t = scol_l (i+1)->when() - scol_l (i)->when ();
          Real k=  paper_l()->arithmetic_constant(context_shortest);
          Real dist = paper_l()->duration_to_dist (shortest_playing_len, k);
-         dist *= delta_t / shortest_playing_len;
+         dist *= (double)(delta_t / shortest_playing_len);
 
          /*
            According to [Ross] and [Wanske], and from what i've seen:
index 0a741a104a68af7cf0a8e1309e25542f5f4309d8..35af4fff2d3fa456dc8f0548467bffa71e9292d1 100644 (file)
@@ -68,7 +68,12 @@ Staff_side::get_position_f () const
   Real inter_f = paper()-> internote_f ();
 
   Interval v= support_height();
-  y = v[dir_] + 2 * dir_ * inter_f;    // ugh
+  if (inside_staff_b_)
+    // ugh: i don't know why, but this is needed for inside-staff
+    y = v[dir_] + 2 * dir_ * inter_f;  // ugh
+  else
+    // get accents just above staff; (fermata etc.: ugh)
+    y = v[dir_] - 3 * dir_ * inter_f;
 
   return y;
 }
index 820b07be3d5e8469cb6838479b2c8b51a832d058..062c1e1a8d8cb875911cd121c347153d80599e9e 100644 (file)
@@ -6,23 +6,23 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#ifndef __CYGWIN32__
 #include "proto.hh"
 #include "pcursor.hh"
 #include "plist.hh"
-/*
+#include "spanner.hh"
+#include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
 #include "p-col.hh"
 #include "p-score.hh"
-*/
 #include "cursor.tcc"
 #include "list.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
-/*
 POINTERLIST_INSTANTIATE(Audio_item);
 POINTERLIST_INSTANTIATE(Audio_staff);
 POINTERLIST_INSTANTIATE(Paper_column);
 POINTERLIST_INSTANTIATE(Paper_score);
-*/
+#endif
index 76713abe78c9a2614c085edf1db5557bd42fe523..997ce5ec675964d2c0d0bf881d197ffc83c7969b 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./make/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           zucht
@@ -36,4 +34,4 @@ lilypond.spec: lilypond.spec.in ../VERSION
        cat $< | $(SED_VERSION) | $(SED_DATE) > $@
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 0d96b7effb77a372ce3c9e4744b63c6a27769b5b..43102d5709d34cc19af35f422171c05c42ad4890 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./make/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           zucht
@@ -69,14 +67,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -84,6 +83,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -98,6 +98,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -123,7 +124,7 @@ SED_DATE=sed 's!@DATE@!${date}!g'
 SED_EXAMPLES = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g'
 SED_DOCS=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -220,7 +221,7 @@ lilypond.spec: lilypond.spec.in ../VERSION
        cat $< | $(SED_VERSION) | $(SED_DATE) > $@
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index df611c045a0902a2a39c22e045d8fbcb73bf6533..e446567a582b725ffe78c416cdf9815116f06baa 100644 (file)
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
 Versie: 
-Inschrijf datum: 31MAR98
+Inschrijf datum: 06APR98
 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: 
index 6b44b2b0dd581860e73d7a0314817e7e2b7de648..2919fd6734d58b2b271693e11b00b419d2a1aac9 100644 (file)
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Version: 
-Entered-date: 31MAR98
+Entered-date: 06APR98
 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 
index da643e9d464577c7e8f25b41f48936e8cbc6883e..a96e01f52fbdd00f438d67cd007fdbcbd837b77f 100644 (file)
@@ -31,7 +31,7 @@ strip lily/out/lilypond mi2mu/out/mi2mu
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
-%doc Documentation/AUTHORS.txt Documentation/CodingStyle.txt Documentation/INSTALL.txt Documentation/MANIFESTO.txt Documentation/PATCHES.txt Documentation/convert-mudela.txt Documentation/faq.txt Documentation/gnu-music.txt Documentation/index.txt Documentation/internals.txt Documentation/language.txt Documentation/lilypond.txt Documentation/links.txt Documentation/literature.txt Documentation/ly2dvi.txt Documentation/mi2mu.txt Documentation/mudela-book.txt Documentation/mutopia.txt Documentation/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README
+%doc  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/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc 
 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
new file mode 100644 (file)
index 0000000..00e7046
--- /dev/null
@@ -0,0 +1,46 @@
+# mf/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+#ugh
+biltdir=../../build/mf
+
+make-in-build: wild-check
+       exec $(MAKE) -C $(biltdir)
+
+# include Makefile
+include $(biltdir)/Makefile
+
+clean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+dist: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+distclean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+endif
+
+# Makefile.am.wild: mi2mu_SOURCES = $(wildcard *.cc)
+# CURRENT_mi2mu_SOURCES = $(wildcard *.cc)
+
+wild-check: 
+
index 625a9a8808a7774c05b749d6e34d2c96941330b4..cee785675fd0e228ab8ac90553708035801b112c 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./mf/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # mf/Makefile.am.wild
 
@@ -15,13 +13,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-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
+EXTRA_DIST = Makefile.am.wild GNUmakefile 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
+lyout = $(top_builddir)/init
+texout = $(top_builddir)/tex
 LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
 TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 
@@ -61,4 +59,4 @@ include $(srcdir)/Rules.make
 include $(MFDEPS)
 #
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 245d7f7eb63eedec12c9cb278d1774acd0b0b005..aa7ff51dff8b7c2e51a3858fe9a30398dee70b09 100644 (file)
@@ -12,13 +12,13 @@ outdir = .
 TEXFILES = $(wildcard *.tex)
 MFFILES = $(wildcard *.mf)
 MFDEPS = $(outdir)/mf.dep
-EXTRA_DIST = Makefile.am.wild Rules.make $(MFFILES) $(TEXFILES) TODO README
+EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO README
 
 FONT_FILES = $(wildcard *[0-9].mf)
 FET_FILES = $(wildcard feta[0-9]*.mf)
 
-lyout = $(depth)/init
-texout = $(depth)/tex
+lyout = $(top_builddir)/init
+texout = $(top_builddir)/tex
 LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
 TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 
index d7563987589af5b0aaf5f5bb8add5f2bb7524629..7b488a8a465e1aa73047d3e7e1e39c9dd3202c90 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./mf/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # mf/Makefile.am.wild
 
@@ -65,14 +63,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -80,6 +79,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -94,6 +94,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -112,17 +113,17 @@ 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-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
+EXTRA_DIST = Makefile.am.wild GNUmakefile 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
+lyout = $(top_builddir)/init
+texout = $(top_builddir)/tex
 LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
 TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README Makefile.am Makefile.in TODO
 
@@ -246,7 +247,7 @@ include $(srcdir)/Rules.make
 include $(MFDEPS)
 #
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index 9c6f8679a1796923c499c8799d2be96b9b98b17a..7c7881c57b709fea28ee9186ac301bf4d7bf8a4c 100644 (file)
@@ -1,22 +1,22 @@
 
-$(outdir)/%.dvi: %.mf
+$(top_builddir)/mf/%.dvi: %.mf
        mf $<
        gftodvi  $(basename $<)
 #      mv $(basename $<).dvi $(outdir)
-       rm $(basename $<).*gf
+#      rm $(basename $<).*gf
 
-$(outdir)/%.log: %.mf
+$(top_builddir)/mf/%.log: %.mf
        mf $<
 #      mv $(@F) $@
-       rm $(basename $< ).*gf
+#      rm $(basename $< ).*gf
 
-$(lyout)/%.ly $(texout)/%.tex: $(outdir)/%.log
-       $(PYTHON) $(depth)/bin/mf-to-table --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
+$(lyout)/%.ly $(texout)/%.tex: $(top_builddir)/mf/%.log
+       $(PYTHON) $(top_builddir)/bin/mf-to-table --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
 
 $(MFDEPS): $(FONT_FILES)
 # do something silly to avoid barfs if python not installed.
        echo > $@
-       $(PYTHON) $(depth)/bin/mf-deps $^ >> $@
+       $(PYTHON) $(top_builddir)/bin/mf-deps $^ >> $@
 
 # silly workaround for stupid TeXs
 systempks:
index de251bbe42b5aa0fdcff2e08f3669c8bd7142070..8e21cc5b4a6e60ddd6091871a5ccc0802ac192b9 100644 (file)
@@ -7,23 +7,49 @@
 
 # automake/wild-make should generate this file from Makefile.am.wild
 
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
 include Makefile
 
+biltdir=.
+
+else
+
+#ugh
+#ugh
+biltdir=../../build/mi2mu
+
+make-in-build: wild-check
+       exec $(MAKE) -C $(biltdir)
+
+# include Makefile
+include $(biltdir)/Makefile
+
+clean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+dist: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+distclean: wild-check
+       exec $(MAKE) -C $(biltdir) $@
+
+endif
+
 # Makefile.am.wild: mi2mu_SOURCES = $(wildcard *.cc)
 CURRENT_mi2mu_SOURCES = $(wildcard *.cc)
 
-# ugh: there is a dummy file 'wild-check' to satisfy the wild-check target
-# for non-GNU makes in Makefile(.test)
-# but we'll ignore that
-# .PHONY: wild-check
-
 wild-check: check-mi2mu-sources
 
 check-mi2mu-sources:
 ifneq ($(mi2mu_SOURCES),$(CURRENT_mi2mu_SOURCES))
        @echo \"$(mi2mu_SOURCES)\"
        @echo \"$(CURRENT_mi2mu_SOURCES)\"
-       @echo  mi2mu_SOURCES changed: NOT yet rerunning make-wild.  Please type:
-       @echo "$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am"
+       @echo  mi2mu_SOURCES changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
 endif
 
index bffa487cb29240ad215c4242720ca9c9ae5d7af3..b18b5e4f9f25459f00a17d0e2d7ed87624e5ded6 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./mi2mu/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for mi2mu
@@ -21,18 +19,18 @@ mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc mid
 # mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
  
-
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
+INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index cced5f03007171bf7260bde03c39d46574a8587c..1330e7dfdb335e92ccc0fadc0022202576fcb660 100644 (file)
@@ -18,16 +18,16 @@ mi2mu_SOURCES = $(wildcard *.cc)
 # mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
  
-
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
+INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
index 61945fc469db90529d8d701129d900f223d68274..d39f33acd1bfb20448f627364d02939e25890e7b 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./mi2mu/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for mi2mu
@@ -68,14 +66,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -83,6 +82,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -97,6 +97,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -117,17 +118,16 @@ mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc mid
 # mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
 
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
+INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../lib
-LDFLAGS = @LDFLAGS@
+DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
 LIBS = @LIBS@
 mi2mu_OBJECTS =  main.o mi2mu-version.o midi-parser.o \
 midi-score-parser.o midi-track-parser.o mudela-column.o mudela-item.o \
@@ -315,210 +315,6 @@ distdir: $(DISTFILES)
          (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-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 \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../flower/include/lgetopt.hh ../flower/include/path.hh \
-       ../flower/include/varray.hh ../lib/include/duration-convert.hh \
-       ../lib/include/duration.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/plet.hh \
-       ../lib/include/source.hh ../lib/include/proto.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/mi2mu-global.hh include/midi-score-parser.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.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 \
-       ../lib/include/source-file.hh ../lib/include/proto.hh \
-       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.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 \
-       ../flower/include/string.hh ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/source.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/mi2mu-global.hh include/midi-score-parser.hh \
-       include/midi-parser.hh include/mi2mu-proto.hh \
-       ../flower/include/parray.hh ../flower/include/varray.hh \
-       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.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 \
-       include/mi2mu-global.hh ../lib/include/proto.hh \
-       include/midi-track-parser.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 ../lib/include/moment.hh \
-       ../flower/include/rational.hh include/mi2mu-proto.hh \
-       include/midi-parser.hh include/mudela-column.hh \
-       include/mudela-item.hh ../lib/include/duration.hh \
-       ../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.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/proto.hh ../flower/include/string-convert.hh \
-       ../lib/include/duration-convert.hh ../lib/include/duration.hh \
-       ../lib/include/moment.hh ../flower/include/rational.hh \
-       ../lib/include/plet.hh ../flower/include/varray.hh \
-       include/mudela-column.hh include/mi2mu-proto.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/mudela-item.hh include/mudela-stream.hh \
-       include/mudela-score.hh ../flower/include/parray.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 \
-       ../lib/include/duration.hh ../lib/include/plet.hh \
-       ../lib/include/duration-convert.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/varray.hh \
-       include/mi2mu-global.hh ../lib/include/proto.hh \
-       include/mudela-column.hh include/mi2mu-proto.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/mudela-item.hh include/mudela-score.hh \
-       ../flower/include/parray.hh include/mudela-staff.hh \
-       include/mudela-stream.hh ../flower/include/list.tcc \
-       ../flower/include/cursor.tcc
-mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../flower/include/compare.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../lib/include/duration-convert.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh ../flower/include/string.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/varray.hh \
-       ../flower/include/string-convert.hh include/mi2mu-proto.hh \
-       include/mi2mu-global.hh ../lib/include/proto.hh \
-       include/mudela-column.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/mudela-item.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.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 \
-       ../flower/include/international.hh ../flower/include/compare.hh \
-       ../lib/include/proto.hh include/mudela-item.hh \
-       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.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 \
-       include/mi2mu-global.hh ../lib/include/proto.hh \
-       include/mudela-column.hh include/mi2mu-proto.hh \
-       ../lib/include/moment.hh ../flower/include/rational.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/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.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/compare.hh \
-       ../flower/include/pcursor.hh ../flower/include/plist.hh \
-       ../flower/include/plist.icc ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/list.tcc \
-       ../flower/include/cursor.tcc include/mudela-item.hh \
-       include/mi2mu-proto.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/mudela-column.hh \
-       include/mudela-staff.hh include/mudela-voice.hh \
-       ../flower/include/plist.tcc
-template9.o: template9.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/list.hh ../flower/include/list.icc \
-       ../flower/include/cursor.hh ../flower/include/link.hh \
-       ../flower/include/link.icc ../flower/include/compare.hh \
-       ../flower/include/pcursor.hh ../flower/include/plist.hh \
-       ../flower/include/plist.icc ../flower/include/cursor.icc \
-       ../flower/include/iterate.hh ../flower/include/list.tcc \
-       ../flower/include/cursor.tcc include/mudela-item.hh \
-       include/mi2mu-proto.hh ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../lib/include/moment.hh \
-       ../flower/include/rational.hh ../lib/include/duration.hh \
-       ../lib/include/plet.hh include/mudela-column.hh \
-       include/mudela-staff.hh include/mudela-voice.hh \
-       include/mudela-score.hh ../flower/include/parray.hh \
-       ../flower/include/varray.hh ../flower/include/pcursor.tcc \
-       ../flower/include/plist.tcc
-version.o: version.cc ../lib/include/proto.hh \
-       ../flower/include/fproto.hh ../flower/include/real.hh \
-       ../flower/include/string.hh \
-       ../flower/include/arithmetic-operator.hh \
-       ../flower/include/string-handle.hh \
-       ../flower/include/international.hh ../flower/include/compare.hh
 
 info: info-recursive
 dvi: dvi-recursive
@@ -608,16 +404,17 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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/mi2mu/include/GNUmakefile b/mi2mu/include/GNUmakefile
new file mode 100644 (file)
index 0000000..a3f707a
--- /dev/null
@@ -0,0 +1,42 @@
+# mi2mu/include/GNUmakefile
+#
+# This file helps maintainers to keep their Makefile.am automatically
+# up to date using GNU make features.
+# If you don't have (or run) GNU make, Makefile.am will not be updated
+# automatically when source files are added/removed.
+
+# automake/wild-make should generate this file from Makefile.am.wild
+
+#ugh
+Makefile=$(wildcard Makefile)
+# are we configured here, or are we using --srcdir
+ifeq ($(Makefile),Makefile)
+
+include Makefile
+
+biltdir=.
+
+else
+
+#ugh
+biltdir=../../../build/mi2mu/include
+
+# include Makefile
+include $(biltdir)/Makefile
+
+endif
+
+# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
+
+wild-check: check-noinst-headers
+
+check-noinst-headers:
+ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
+       @echo \"$(noinst_HEADERS)\"
+       @echo \"$(CURRENT_noinst_HEADERS)\"
+       @echo  noinst_HEADERS changed: rerunning make-wild.
+       @-rm -f Makefile.am
+       $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+endif
+
index ca22f222b5b52bada04c63e5f34febd05c454cec..d68e0d2c497b647867c791316902f90678db2868 100644 (file)
@@ -1,11 +1,17 @@
-# Automatically generated from ./mi2mu/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
-# lib/include/Makefile.am.wild
+# mi2mu/include/Makefile.am.wild
 
 noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser.hh midi-track-parser.hh mudela-column.hh mudela-item.hh mudela-score.hh mudela-staff.hh mudela-stream.hh mudela-voice.hh dummy.icc dummy.tcc
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 1cf201f1c690bdd5eadb751dc3a39e8631ead494..d03dd288176c97fc5b61a8973de6d7382accefe5 100644 (file)
@@ -1,6 +1,14 @@
-# lib/include/Makefile.am.wild
+# mi2mu/include/Makefile.am.wild
 
 noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
index cb195580938c844a326afcf6389844fbd041ffa5..e323017787744d24bba2791366f250c305ebf471 100644 (file)
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./mi2mu/include/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
-# lib/include/Makefile.am.wild
+# mi2mu/include/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -101,9 +102,9 @@ absolute_builddir = @absolute_builddir@
 
 noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser.hh midi-track-parser.hh mudela-column.hh mudela-item.hh mudela-score.hh mudela-staff.hh mudela-stream.hh mudela-voice.hh dummy.icc dummy.tcc
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../lib/config.hh
+CONFIG_HEADER = ../../flower/config.hh
 CONFIG_CLEAN_FILES = 
 HEADERS =  $(noinst_HEADERS)
 
@@ -217,8 +218,16 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index f61b26330855ca2ead1fe6f032f3e6e4e8268319..f87f282ea2cfd774e9ee21cc750c91e496953109 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./mutopia/J.S.Bach/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # mutopia/J.S.Bach/Makefile.am.wild
 
@@ -13,4 +11,4 @@ OUTFILES = $(M4FILES:%.m4=%)
 default: all $(OUTFILES)
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 79863de42fa920f2717b7bde2ad963ccd48f7933..cca106e880ff59afb86ff02a88fad3bdb042b239 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./mutopia/J.S.Bach/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # mutopia/J.S.Bach/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -106,7 +107,7 @@ EXTRA_DIST = Makefile.am.wild $(LYFILES) $(TEXFILES) $(M4FILES)
 
 OUTFILES = $(M4FILES:%.m4=%)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../lib/config.hh
+CONFIG_HEADER = ../../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -197,7 +198,7 @@ mostlyclean distclean maintainer-clean
 default: all $(OUTFILES)
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.
index a2bd3542b2c8efa15d9869488b7087817fed1929..68a1117b0b63a87f74074e208e8bc8f95224d1b7 100644 (file)
@@ -15,7 +15,7 @@
 
 \version "0.1.9";
 
-\include "dutch.ly"                 % for correct parsing of note names
+\include "nederlands.ly"                 % for correct parsing of note names
 
 global = \melodic {
   \meter 4/4;
index 25d76365b60db6ce21ba44f218957455386c5fb8..1ea267e2800bbf9950bbc4f2d3890fb317d1e8e8 100644 (file)
@@ -1,12 +1,10 @@
-# Automatically generated from ./mutopia/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # mutopia/Makefile.am.wild
 
 SUBDIRS = J.S.Bach
 
 LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly
-TEXFILES = gallina.tex standchen-16.tex standchen-20.tex
+TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex
 M4FILES = dummy.m4
 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
 
@@ -14,4 +12,4 @@ OUTFILES = $(M4FILES:%.m4=%)
 
 default: all $(OUTFILES)
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index aaf6dca564f3b1aa7d13be5a97037296c3521442..a8228714a0b8d5ee9eee713f73fff00a7eb35f4e 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./mutopia/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # mutopia/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -102,13 +103,13 @@ absolute_builddir = @absolute_builddir@
 SUBDIRS = J.S.Bach
 
 LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly
-TEXFILES = gallina.tex standchen-16.tex standchen-20.tex
+TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex
 M4FILES = dummy.m4
 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
 
 OUTFILES = $(M4FILES:%.m4=%)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in TODO
 
@@ -285,7 +286,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 default: all $(OUTFILES)
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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/mutopia/los-toros-oboe-20.tex b/mutopia/los-toros-oboe-20.tex
new file mode 100644 (file)
index 0000000..910651a
--- /dev/null
@@ -0,0 +1,24 @@
+\documentclass{article}         %UGH
+\usepackage{a4}
+
+%
+% UGH UGH
+\advance\oddsidemargin-30mm
+\evensidemargin\oddsidemargin
+% ugh, centre
+\advance\textwidth60mm
+\advance\topmargin-20mm
+\addtolength{\textheight}{40mm}
+\pagestyle{empty}
+\begin{document}
+\input lilyponddefs
+\input titledefs
+\def\interscoreline{\vskip3mm}
+\title{La Feria\normalsize\\[2ex]Los Toros}
+\composer{Paul Lac\^ome d'Estalenx (1838-1920)}
+%\instrument{} % heu
+%#%\tempo{M\"a\ss ig}
+\makelilytitle
+\input{los-toros-oboe.tex}
+%\input lelie.tex
+\end{document}
index 04c6d9b80d0b056f5acb29898d28ac2a5317e34f..20f454567e5273aba3cfee8e4a8d2c07f1436c8e 100644 (file)
@@ -7,18 +7,29 @@ enteredby =    "jcn";
 copyright =     "public domain";
 } 
 
+\include "paper20.ly"
 
-hobo1 = \melodic{
+hoboonestart = \melodic{
+% ugh: can't copy: allegro/primo tempo
        \octave c';
-       [es'16-. es'-. es'-. es'-.] [es'8-. d'-.] |
+       \textstyle "roman";
+       [es'16-.-"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] |
+       \textstyle "italic";
+}
+
+hobooneintro = \melodic{
+       \octave c';
+%      \textstyle "roman";
+%      [es'16-.-"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] |
+%      \textstyle "italic";
        [f'8.-> es'16(] [)d'8 c'-.] |
        [bes16( c' d' es'] [)d'8 c'-.] |
        [bes-. as->~] [as16( g f g] |
        [as bes c' d'] [)es'8 c'-.] |
        [d'8-. c'16( bes] )a4 ~ |
-       [as16 g f g] [as c' bes as] |
-%      [)g8 as16(] [)f8 g16( f] |
-       [)g8. as16(] [)f8 g16( f] |
+       [as16 g( f g] [as c' bes as] |
+%      [)g8 as16 g(] [)f8 g16( f] |
+       [)g8 as16 g(] [)f8 g16( f] |
        [)es8 f16-. g-.] [as-. bes-. c'-. d'-.] |
        [es'-. es'-. es'-. es'-.] [es'8-. d'-.] |
        [f'8.-> es'16(] [)d'8 c'-.] |
@@ -29,20 +40,30 @@ hobo1 = \melodic{
        [g'16 f'( es' d'] [c' es'  d' c'] |
        [)bes8 c'16( bes] [)a8 bes16( a] |
        [)g8  r d'] r |
+}
+
+hoboonemid = \melodic{
+       \octave c';
        [g16-. g-. g-. g-.] [g8-. f-.] |
        as2-> |
        [as16-. as-. as-. as-.] [as8-. g-.] |
        bes2-> |
        [bes16-. bes-. bes-. bes-.] [bes8-. c'] |
+
        r-"cresc." [d'8-. r c'-.] |
        r\f [d'-. es'-. f'-.] |
        [g'8.-> es'16] [bes8 g] |
+
+       % four measures copied from 8 measures back...
        [g16-.\p g-. g-. g-.] [g8-. f-.] |
        as2-> |
        [as16-. as-. as-. as-.] [as8-. g-.] |
        bes2-> |
        [b16-. b-. b-. b-.] [b8-. c'-.] |
+
+       % same measure
        [b16-. b-. b-. b-.] [b8-. c'-.] |
+
        [b8-.-"cresc." c'-. b-. c'-.] |
        [d'-. es'-. d'-. es'-.] |
        [f'\f-. g'-. f'-. g'-.] |
@@ -58,21 +79,208 @@ hobo1 = \melodic{
        [c' es' d' c'] [b d' c' b] |
        [a c' bes a] [g bes a g] |
        [fis a g fis] [e g fis )e] |
-       % a 2
+       % `a deux
+       [d8 d'] [es'8.-> c'16] |
+       [a8 bes g es] |
+       [c' d' es8. bes16] |
+       [g8 es bes c] |
+       [d16-. d-. d-. d-.] [d8.-. es16->] |
+       [d'16-.-"cresc." d'-. d'-. d'-.] [d'8.-. es'16->] |
+       [d'16-. d'-. d'-. d'-.] [d'8.-. es'16->] |
+       [d'16 d' d' d'] [d'8 es'16-.] r16-\fermata-"court"-"tr\\`es" |
+       % Un peu plus lent.
+       \textstyle "roman";
+
+% ugh
+%      d'4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant"
+       d'4(\<^"Un peu plus lent"
+       \textstyle "italic"; 
+       [e'8_"tr\\`es \\'el\\'egant" \!f'8] |
+       [)b'-. a'-.] [g16( fis' e' )d'] |
+       [d'( c' b\< c'] [)\!f'8-. e'-.] |
+       d4-> ~ [d16 e( fis g] |
+       [a b\< d' fis] [)\!a'8-. g'-.] |
+       [fis'16( e' a )c'] e'4 ~ |
+       [e'16 d'( e c'] [)b8-. a-.] |
+       g2 ~ |
+       [g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] |
+       b2-> ~ |
+       [b8 \[/3 d16( e fis ]1/1 [)g8-"cresc. poco" e'-.] |
+       e'2-> ~ |
+       [e'8 \[/3 d16( e fis ]1/1 [)g8\f d'-.] |
+       [d'8.-> b'16-.] [g'16-. d'-. b-. c'-.] |
+       [d'-. e'-. fis'-. a'-.] [g'8-. e'-.] |
+       fis'2-> ~ |
+       [fis'16 g'-.\< a'-. b'-.] [\!c''8-. c'-.] |
+       [es'8.->(-"espress.") d'16] d'4 ~ |
+       [d'16 e'( fis a'] [)g'8 b-.] |
+       [b8.->( )c'16] c4 ~ |
+       [c'16\< cis'( d' \!dis'] [)e'8-.-"dim." fis-.] |
+       [fis8.->( g16] )g4 ~ |
+
+       % (only notes! of) five measures copied from 14 measures above
+       [g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] |
+       b2->-"cresc." ~ |
+       [b8 \[/3 d16( e fis ]1/1 [)g8 e'-.] |
+       e'2-> ~ |
+       [e'8 \[/3 d16(_"h\\^atez" e fis ]1/1 [)g8\f d'-.] |
+       [d'8.-> b16-.] [g16-.-"cresc." d'-. b-. c'-.] |
+       [d'16\f\< e'-. fis'-. g'-.] [a'-. b-. c'-. \!d'-.] 
+}
+
+
+hoboonesecondstart = \melodic{
+       \octave c';
+% ugh: can't copy: allegro/primo tempo
+       \textstyle "roman";
+       [es'16-.\ff^"Tempo 1$^o$" es'-. es'-. es'-.] [es'8-. d'-.] |
+       \textstyle "italic";
+       
+}
+       
+hoboonelast = \melodic{
+       \octave c';
+       % could transpose/copy from measure 19...
+       [d'16-.\p  d'-. d'-. d'-.] [d'8-. c'-.] |
+       es'2-> |
+       [es'16-. es'-. es'-. es'-.] [es'8-. d'-.] |
+       f'2-> |
+       [f'16-. f'-. f'-. f'-.] [f'8-. g'-.] |
+       r8 [a'-.-"cresc." r g'-.] |
+       r [a'-.\f bes'-.\< \!c''-.] |
+       [d''8.->\> \!bes'16] [f'8 d'] |
+
+       % four measures copied from 8 measures back...
+       [d'16-.\p  d'-. d'-. d'-.] [d'8-. c'-.] |
+       es'2-> |
+       [es'16-. es'-. es'-. es'-.] [es'8-. d'-.-"cresc."] |
+       f'2-> |
+       [fis'16-.\p  fis'-. fis'-. fis'-.] [fis'8-. g'-.] |
+       % same measure
+       [fis'16-.\p  fis'-. fis'-. fis'-.] [fis'8-. g'-.] |
+       [fis'8-. g-. fis-. g-.] |
+       [a'-. bes'-. a'-. bes'-. ] |
+       [a'-.\f bes'-. a'-. bes'-. ] |
+       [c''-.-"cresc." f'-. g'-. a'-.] |
+       [bes'-. bes'-. ces''8.-> as'16] |
+       [f'8-. ges'-. es'-. ces'-.] |
+       % `a deux
+       [as-. bes-. ces'8.-> ges16] |
+       [es8-. ces'-. ges-. as-.] |
+       bes\p r r4 |
+       [bes16-.-"cresc." bes-. bes-. bes-.] [bes8-. ces'->] |
+       % same measure
+       [bes16-. bes-. bes-. bes-.] [bes8-. ces'->] |
+       \textstyle "roman";
+       [bes'16-.\ff bes'-. bes'-. bes'-.] [bes'8-. ces''16->] r16^"court"-\fermata |
+       % ugh: eight measures rest (ugh: r1 -> four beats...)
+       r2-"Un peu plus lent et \\'el\\'egant"
+       \textstyle "italic";
+       r4 r8\p bes |
+       g2-> ~ |
+       g8 r r c' |
+       c'2-> ~ |
+       c'8 r r bes'\f |
+       [bes'8.->\f g'16-.] [es'16-. bes-. g-. as-.] |
+       [bes-.-"dim." c'-. d'-. f'-.] [es'8-. c'-.] |
+       d'2-> ~ |
+       [d'16-"dim."( es' f' g'] [)as'8 as-.] |
+       [ces'8.->\p( )bes16-.] bes4 ~ |
+       [bes16( c' d' f] [)es'8 g-.] |
+       [g8.->( )as16] as4 ~ |
+       [as16( a bes b] [)c'8-. d-.] |
+       % a deux
+       [d8.->( ) es16] es4 ~ |
+       es4 r8 bes-. |
+       g2-> ~ |
+       g8 r r c' |
+       c'2 ~ |
+       c'8  r r bes' |
+       [bes'8.-> g'16-.] [es'16-. bes-. g-. as-.] |
+       [bes-. c'-. d'-. es'-.] [f'-. g'-. as'-. bes'-.] |
+       d''8-. r c''4-> ~ |
+       [c''16 f-. g'-. a-.] [bes'-. c'-. d'-. es'-.] |
+       g'8-. r f'4-> ~ |
+       [f'16 bes-. c'-. d-.] [es'-. f'-. g-. as-.] |
+       c''8 r bes'4 ~ |
+       [bes'8 as'-. g'8.-. e'16-.] |
+       g'8-. r f4-> ~ |
+       [f'8 es'-. ces'8.-. as16-.] |
+       % `a deux
+       \textstyle "roman";
+       [ces'8.->^"Plus vite" bes16-.(] [a bes es' d'] |
+       \textstyle "italic";
+       [)c!8.-> bes16] [a( bes es' )d'] |
+       [c'->( bes es' )d'] [c'->( bes es' )d'] |
+       % same measure
+       [c'->( bes es' )d'] [c'->( bes es' )d'] |
+       [c'( bes a bes] [c' d es' e] |
+       [g' )f' d'( es'] [f' g' as' a'] |
+       [c'' )bes' bes( c'] [d' es' f' g'] |
+       [as' g' f' g'] [as' bes' c'' d''] |
+       [)es''-.^"Tempo 1$^o$" g'-. g'-. g-.] [g'8-. g'-.] |
+       bes'4.-> g'8-. |
+       gis'2->( |
+       )as'! |
+       [g'16-. g'-. g'-. g-.] [g'8-. g'-.] |
+       bes'4.-> g'8-. |
+       gis'2->( |
+%      )as'! |
+       )as' |
+       [bes'16-. bes'-. bes'-. bes-.] [bes'8-. bes'-.] |
+       bes'4.-> g'8-. |
+       [g'16-._"h\\^atez" g'-. g'-. g-.] [g'8-. g'-.] |
+       g'4.-> g'8-. |
+       es'4.-> es'8-. |
+       bes4.-> bes8-. |
+       \textstyle "roman";
+       g'4.->^"Presto" g'8-. |
+       \textstyle "italic";
+       es'4.-> es'8-. |
+       [bes-. bes-. es'-. g-.] |
+       [bes'-. bes-. es'-. g'-.] |
+       bes'-. r r4 |
+       g'8-. r r4 |
+       g'8-. r r4 |
+}
+
+hoboone = \melodic {
+       \hoboonestart
+       \hobooneintro
+       \hoboonemid
+       \hoboonesecondstart
+       \hobooneintro
+       \hoboonelast
 }
 
 global = \melodic{
        \key bes es as;
        \meter 2/4;
+       \skip 4*106;
+       \bar "||";
+       \key fis;
+       \skip 4*60;
+       \bar "||";
+       \key bes es as;
 }
 
-$staff_hobo1 = \type Staff = hobo1 <
+
+$staff_hoboone = \type Staff = hoboonestaff <
        \global
-       \hobo1
+       \property Staff.instrument = "oboe"
+       \hoboone
 >
 
+a4 = \paper{
+       \paper_twenty
+       linewidth= 195.\mm;
+}
+
 \score{
-       \$staff_hobo1
-       \paper{}
-       \midi{}
+       \$staff_hoboone
+       \paper{ \a4 }
+       \midi{
+               \tempo 4 = 120;
+       }
 }
+
index 927786c873abfd83ea2433dfc2fe7930252fb8f4..292c05971084321f9a789fcb8ef75c0808104dc5 100644 (file)
@@ -1,5 +1,3 @@
-# Automatically generated from ./tex/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # tex/Makefile.am.wild
 
@@ -16,4 +14,4 @@ uninstall-local:
        for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
        -rmdir $(TEXDIR)/lilypond/
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
index 96a0f969338cb4e3f8d49d9b50fa79bb8a1e5528..c50d1b2eec372f4001e945b86bb3fa5ade372b26 100644 (file)
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Automatically generated from ./tex/Makefile.am.wild by autowild
-# Do not edit
 # Generated automatically by wild-perl 0.1
 # tex/Makefile.am.wild
 
@@ -62,14 +60,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AGE = @AGE@
 AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
 CPPFLAGS = @CPPFLAGS@
+CURRENT = @CURRENT@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-DEFINES = @DEFINES@
 DIR_DATADIR = @DIR_DATADIR@
 EXTRA_LIBES = @EXTRA_LIBES@
 FIND = @FIND@
@@ -77,6 +76,7 @@ FLEX = @FLEX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 LD = @LD@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LN = @LN@
@@ -91,6 +91,7 @@ POD2HTML = @POD2HTML@
 POD2MAN = @POD2MAN@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+REVISION = @REVISION@
 TAR = @TAR@
 TEXDIR = @TEXDIR@
 TEXPREFIX = @TEXPREFIX@
@@ -104,7 +105,7 @@ EXTRA_DIST = Makefile.am.wild $(TEXFILES)
 
 CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../lib/config.hh
+CONFIG_HEADER = ../flower/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -200,7 +201,7 @@ uninstall-local:
        for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
        -rmdir $(TEXDIR)/lilypond/
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl --top-srcdir="$(real_topdir)" < $< > $@
+       $(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.