lilypond-0.1.51

diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
index 0c9c750b9352fa9b5235561be6d5185acc4833da..7e3d369fd46bd200727b18bb9b10fb7278a13bbb 100644 (file)
--- a/Documentation/Makefile.in
+++ b/Documentation/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# Documentation/Makefile.am.wild
+# Automatically generated from ./Documentation/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# Documentation/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 DOCFILES = introduction.doc mudela-course.doc mudela-man.doc
 PODFILES = AUTHORS.pod CodingStyle.pod INSTALL.pod MANIFESTO.pod PATCHES.pod convert-mudela.pod faq.pod gnu-music.pod index.pod internals.pod language.pod lilypond.pod links.pod literature.pod ly2dvi.pod mi2mu.pod mudela-book.pod mutopia.pod other-packages.pod
@@ -204,6 +208,9 @@ mostlyclean distclean maintainer-clean
 
 default: all $(TEXTFILES)
 
+%.1: %.pod
+       $(POD2MAN) --section=1 $*.pod > $@
+
 install-data-hook: $(MAN1GROFF)
        $(INSTALL) -d $(mandir)/man1
        $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
@@ -216,6 +223,7 @@ html: $(HTMLFILES)
 clean-hook:
        rm $(TEXTFILES) $(MAN1GROFF)
 
+include $(top_srcdir)/Documentation/Rules.make
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
        $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
 

diff --git a/Makefile.in b/Makefile.in
index bcf8a0234a6d0728942c9d2d55fc57390747ffda..4e1bdbe4906467c04b07233d3b8a71dd9611fd63 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,6 +10,8 @@
 # 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
@@ -59,7 +61,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +96,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 SUBDIRS = bin flower lib lily mf mi2mu debian\
        Documentation init input tex make mutopia
@@ -108,9 +111,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./lib/config.hh
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \
-configure configure.in install-sh ltconfig ltmain.sh missing \
-mkinstalldirs
+Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
+config.hh.in config.sub configure configure.in install-sh ltconfig \
+ltmain.sh missing mkinstalldirs stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -134,6 +137,27 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
+config.hh: stamp-h
+       @:
+stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
+       cd $(top_builddir) \
+         && CONFIG_FILES= CONFIG_HEADERS=lib/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:
+
+distclean-hdr:
+       -rm -f config.hh
+
+maintainer-clean-hdr:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -177,7 +201,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP)
        here=`pwd` && cd $(srcdir) \
          && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -187,8 +211,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        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)
+       test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \
+         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -288,14 +312,14 @@ distclean-generic:
 maintainer-clean-generic:
        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
-distclean-am:  distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-               distclean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+               maintainer-clean-generic distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
 
@@ -310,7 +334,8 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "it deletes files that may require special tools to rebuild."
        -rm -f config.status
 
-.PHONY: default install-data-recursive uninstall-data-recursive \
+.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
+maintainer-clean-hdr 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 \

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 775180c1d22b3a0664b1f9006fa40e56ebb26a26..2a45668f8652e3b8d8909af5f50c81f6bf2d91ae 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -10,10 +10,12 @@
 # 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 = 
+# 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
 
 
 SHELL = /bin/sh
@@ -62,7 +64,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -97,10 +99,12 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
+SLANG_SCHRIFTEN = flower.py lilypython.py
 PAREL_SCHRIFTEN = 
-IN_SCHRIFTEN = 
-EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl
+IN_SCHRIFTEN = flower.py lilypython.py
+EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../lib/config.hh
 CONFIG_CLEAN_FILES =  add-URLs clean-diaper clean-embeds clean-fonts \

diff --git a/debian/Makefile.in b/debian/Makefile.in
index 42ec05cfb840823bef2a99cda6764e4b3a33770c..b466cc2be979ddf4dceb1e6dddf976fc04daf399 100644 (file)
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# debian/Makefile.am.wild
+# Automatically generated from ./debian/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# debian/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
        postinst postinst.old.sh postrm preinst rules watch

diff --git a/flower/Makefile.in b/flower/Makefile.in
index d3d3612e89082c57b81cd7ecb231fc5d9159777c..27bd4a909bb0351f1394ceb95eb5a1da512a2b95 100644 (file)
--- a/flower/Makefile.in
+++ b/flower/Makefile.in
@@ -10,6 +10,8 @@
 # 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
@@ -90,7 +92,7 @@ SUBDIRS = include test
 lib_LTLIBRARIES = libflower.la
 
 README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES)
+EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(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
 
@@ -121,8 +123,8 @@ 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 aclocal.m4 config.hh.in configure configure.in \
-missing mkinstalldirs stamp-h.in
+Makefile.in NEWS TODO acconfig.h aclocal.m4 config.hh.in configure \
+configure.in missing mkinstalldirs stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -159,7 +161,7 @@ stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
             $(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) 
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
        cd $(top_srcdir) && $(AUTOHEADER)
        @echo timestamp > $(srcdir)/stamp-h.in
 
@@ -370,7 +372,7 @@ data-file.lo data-file.o: data-file.cc include/international.hh \
 diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \
        include/diagonal-storage.hh include/full-storage.hh \
        include/varray.hh include/matrix-storage.hh include/real.hh \
-       include/virtual-methods.hh include/full-storage.icc
+       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

diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in
index b52fb14ab96803a5526e25fe2b580d8fb534563d..2dfc1914bea1525ab65cd10c71b701957a05e2cf 100644 (file)
--- a/flower/include/Makefile.in
+++ b/flower/include/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# flower/lib/include/Makefile.am.wild
+# 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
 
 
 SHELL = /bin/sh

diff --git a/flower/test/Makefile.in b/flower/test/Makefile.in
index 55bbf89aceb00dc1f59637415e464f05bfe8a2ed..9aa4333249d01e79596af30d928b600f9bc3c521 100644 (file)
--- a/flower/test/Makefile.in
+++ b/flower/test/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1#
+# 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

diff --git a/init/Makefile.in b/init/Makefile.in
index 65368541a2a638e8bfc8e465dad6d5171773d244..b8347b24bc755c4b1f8225fcaeaf7dc9f55e9f2e 100644 (file)
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# init/Makefile.am.wild
+# Automatically generated from ./init/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# init/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,8 +97,9 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
-INIFILES = dutch.ly dynamic.ly engraver.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly
+INIFILES = deutsch.ly dynamic.ly engraver.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly
 EXTRA_DIST = Makefile.am.wild $(INIFILES)
 
 CLEANFILES = 

diff --git a/input/Makefile.in b/input/Makefile.in
index 588a8d7dc4ce665f98f36f59cfc46c0b28dea054..e5e3228abd14de20081cc295ce301c8d1ec18026 100644 (file)
--- a/input/Makefile.in
+++ b/input/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# input/Makefile.am.wild
+# Automatically generated from ./input/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# input/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,8 +97,9 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
-LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly twinkle-pop.ly twinkle.ly
+LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly tril.ly twinkle-pop.ly twinkle.ly
 TEXFILES = dummy.tex
 M4FILES = dummy.m4
 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9c1e1f6ced717824d9705d95615d5d0e4e5d04e1..76b5a65adfecfb018c06ae7d554f9c1990a1d6f4 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -10,6 +10,8 @@
 # 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
@@ -67,7 +69,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -102,6 +104,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 SUBDIRS = include
 
@@ -111,7 +114,7 @@ liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc inclu
 
 INCLUDES = -Iinclude -I../flower/include
 
-EXTRA_DIST = Makefile.am.wild config.hh.in
+EXTRA_DIST = Makefile.am.wild
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.hh
 CONFIG_CLEAN_FILES = 
@@ -130,7 +133,7 @@ template.lo warn.lo windhoos-suck-suck-suck-thank-you-cygnus.lo
 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 =  Makefile.am Makefile.in config.hh.in stamp-h.in
+DIST_COMMON =  Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -151,27 +154,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-config.hh: stamp-h
-       @:
-stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
-       cd $(top_builddir) \
-         && CONFIG_FILES= CONFIG_HEADERS=lib/config.hh:lib/config.hh.in \
-            $(SHELL) ./config.status
-       @echo timestamp > stamp-h
-$(srcdir)/config.hh.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOHEADER)
-       @echo timestamp > $(srcdir)/stamp-h.in
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-       -rm -f config.hh
-
-maintainer-clean-hdr:
-
 mostlyclean-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
@@ -285,7 +267,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 \
@@ -295,8 +277,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:
 
@@ -505,19 +487,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
@@ -534,14 +515,13 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
-maintainer-clean-hdr mostlyclean-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 \

diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in
index f6294abc3192f80df929154a34926af190548257..d265d91c2d04e47492bc46114379a00e0a2d1bec 100644 (file)
--- a/lib/include/Makefile.in
+++ b/lib/include/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# lib/include/Makefile
+# Automatically generated from ./lib/include/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# lib/include/Makefile
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+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
 

diff --git a/lily/Makefile.in b/lily/Makefile.in
index adc2cd82295dadf2be3c95f11b5ec40191060026..7440c2f3e87945aa899589ee6c556f4648ba9e12 100644 (file)
--- a/lily/Makefile.in
+++ b/lily/Makefile.in
@@ -10,6 +10,8 @@
 # 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
@@ -66,7 +68,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -101,6 +103,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 SUBDIRS = include
 
@@ -112,13 +115,14 @@ bin_PROGRAMS = lilypond
 lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
 noinst_HEADERS = parser.hh
 
-lilypond_LDADD = -llily -lflower @LEXLIB@
+#lilypond_LDADD = -llily -lflower @LEXLIB@
+lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
 
-lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
+lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 
 INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
 
-EXTRA_DIST = Makefile.am.wild Stable.make VERSION
+EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../lib/config.hh
 CONFIG_CLEAN_FILES = 
@@ -172,7 +176,8 @@ translator-ctors.o translator-group.o translator.o type-swallow-trans.o \
 version.o vertical-align-elem.o vertical-align-grav.o \
 vertical-align-spanner.o vertical-group-spanner.o voice-iterator.o \
 warn.o word-wrap.o lexer.o parser.o
-lilypond_DEPENDENCIES = 
+lilypond_DEPENDENCIES =  $(top_builddir)/lib/liblily.la \
+$(top_builddir)/flower/libflower.la
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LEXLIB = @LEXLIB@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
@@ -2388,14 +2393,15 @@ p-score.o: p-score.cc include/main.hh include/lily-proto.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-score.hh include/music-output.hh \
-       include/tex-stream.hh include/p-col.hh \
+       include/colhpos.hh include/p-col.hh \
        include/horizontal-group-item.hh include/elem-group.hh \
        include/axis-group-element.hh \
        include/axis-group-administration.hh include/axis-group-item.hh \
-       include/item.hh include/header.hh include/word-wrap.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
+       include/outputter.hh ../flower/include/plist.tcc \
+       ../flower/include/pcursor.tcc
 paper-def.o: paper-def.cc ../flower/include/string.hh \
        ../flower/include/arithmetic-operator.hh \
        ../flower/include/fproto.hh ../flower/include/real.hh \
@@ -3803,13 +3809,13 @@ template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \
        ../lib/include/proto.hh ../flower/include/fproto.hh \
        ../flower/include/real.hh ../flower/include/varray.hh \
        ../flower/include/vector.hh ../flower/include/interval.hh \
-       ../flower/include/compare.hh ../flower/include/plist.tcc \
-       ../flower/include/plist.hh ../flower/include/list.hh \
-       ../flower/include/list.icc ../flower/include/cursor.hh \
-       ../flower/include/link.hh ../flower/include/link.icc \
-       ../flower/include/pcursor.hh ../flower/include/cursor.icc \
+       ../flower/include/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/pcursor.tcc
+       ../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 \
@@ -3823,9 +3829,33 @@ template3.o: template3.cc include/atom.hh ../flower/include/string.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/plist.tcc \
-       ../flower/include/pcursor.tcc
-template4.o: template4.cc
+       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 include/audio-item.hh \
+       include/lily-proto.hh ../flower/include/string.hh \
+       ../flower/include/arithmetic-operator.hh \
+       ../flower/include/string-handle.hh \
+       ../flower/include/international.hh include/audio-element.hh \
+       ../flower/include/virtual-methods.hh include/audio-staff.hh \
+       include/p-col.hh include/horizontal-group-item.hh \
+       include/elem-group.hh include/score-elem.hh \
+       ../flower/include/parray.hh ../flower/include/varray.hh \
+       ../flower/include/directed-graph.hh \
+       include/graphical-element.hh include/offset.hh include/axes.hh \
+       ../flower/include/interval.hh include/axis-group-element.hh \
+       include/axis-group-administration.hh include/axis-group-item.hh \
+       include/item.hh include/boxes.hh include/drul-array.hh \
+       include/direction.hh include/p-score.hh include/colhpos.hh \
+       include/music-output.hh ../flower/include/cursor.tcc \
+       ../flower/include/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 \
@@ -3858,8 +3888,8 @@ template7.o: template7.cc ../lib/include/proto.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/plist.tcc \
-       ../flower/include/pcursor.tcc include/music-list.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 \
@@ -3875,13 +3905,13 @@ template8.o: template8.cc ../lib/include/proto.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-column.hh \
-       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/plist.icc include/audio-item.hh \
+       include/lily-proto.hh ../flower/include/string.hh \
+       ../flower/include/arithmetic-operator.hh \
+       ../flower/include/string-handle.hh \
        ../flower/include/international.hh include/audio-element.hh \
-       ../flower/include/virtual-methods.hh include/audio-staff.hh \
+       ../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 \
@@ -4492,17 +4522,12 @@ parser.hh: parser.yy
        $(BISON) -d $<
        mv $<.tab.h $@
        mv $<.tab.c $(shell basename $@ .hh).cc
-# .ll.cc:
-# ugh, stupid automake 
-# now set output root by hand...
-#      touch lex.yy.cc
 
-# .yy.cc:
-#      $(BISON) $<
-#      mv $(shell basename $@ .cc ).tab.c $@
-#      $(FLEX) -Cfe -p -p -t $< > $@
-# # could be faster:
-# #    $(FLEX) -8 -Cf -t $< > $@
+# 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 < $< > $@

diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in
index 7171e5dd95710355914867275a7646500d09b41a..7da93c0656f79bcc1670d7b82d246a431f52710c 100644 (file)
--- a/lily/include/Makefile.in
+++ b/lily/include/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# lily/include/Makefile.am.wild
+# 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
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
 

diff --git a/make/Makefile.in b/make/Makefile.in
index fd0d1e75365068e6521aa73df3ac436641f3e51b..cbd578ad79fbe3067de6a57879b17c4f0e183a5a 100644 (file)
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# project  LilyPond -- the musical typesetter
+# 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
 # file    make/Makefile.am.dist
 #
@@ -66,7 +69,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -101,6 +104,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 IN_FILES = Configure_variables.make.in Makefile.in Toplevel.make.in lelievijver.lsm.in lilypond.lsm.in lilypond.spec.in
 MAKE_FILES = Files.make Include.make Initial.make Rules.make Targets.make Template.make User.make Variables.make Version.make

diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm
index 868e8f293ce92e1f94b0fb2e7e9948a66a7c1857..4718bdc78efbb9ccf0d923824e5a5cbd81693fa1 100644 (file)
--- a/make/lelievijver.lsm
+++ b/make/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
 Versie: 
-Inschrijf datum: 24MAR98
+Inschrijf datum: 27MAR98
 Beschrijving: LilyPond is de muziek typesetter van het GNU Project.  
                Het programma genereert muziek in zichtbare of 
                hoorbare vorm uit uit een muzikale definitie file: 

diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index 241eb8b49e9538e45138cbdf7846a0d78a6fa508..0b8664a06bf7320fbadf53f4158f98fb00d78ac7 100644 (file)
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Version: 
-Entered-date: 24MAR98
+Entered-date: 27MAR98
 Description: LilyPond is the GNU Project music typesetter.  The program
                generates visual or auditive output from a music 
                definition file: it can typeset formatted sheet music 

diff --git a/mf/Makefile.in b/mf/Makefile.in
index fd416832810f1bff7942e82a6274ecf1ca26404f..c107b24b5dd6f01fbe68d40a0b0f1b550a1de948 100644 (file)
--- a/mf/Makefile.in
+++ b/mf/Makefile.in
@@ -10,6 +10,8 @@
 # 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
 
@@ -63,7 +65,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -98,6 +100,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 depth = ..
 #

diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in
index cf4257fccaf5518e606dab1cfc75452b126e746d..4401cee22fffade7f256069e610d9ad119dd03fd 100644 (file)
--- a/mi2mu/Makefile.in
+++ b/mi2mu/Makefile.in
@@ -10,6 +10,8 @@
 # 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
@@ -66,7 +68,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -101,6 +103,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 SUBDIRS = include
 
@@ -109,13 +112,14 @@ bin_PROGRAMS = mi2mu
 mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc
 
 # ugh -lfl bo lib/FlexLexer stuff
-mi2mu_LDADD = -llily -lflower -lfl
+#mi2mu_LDADD = -llily -lflower -lfl
 
-mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
+# 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
 
-EXTRA_DIST = Makefile.am.wild VERSION TODO
+EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../lib/config.hh
 CONFIG_CLEAN_FILES = 
@@ -129,7 +133,9 @@ mi2mu_OBJECTS =  main.o mi2mu-version.o midi-parser.o \
 midi-score-parser.o midi-track-parser.o mudela-column.o mudela-item.o \
 mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o template.o \
 version.o
-mi2mu_DEPENDENCIES = 
+mi2mu_DEPENDENCIES =  $(top_builddir)/lib/liblily.la \
+$(top_builddir)/flower/libflower.la
+mi2mu_LDFLAGS = 
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
 CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
@@ -582,6 +588,11 @@ 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 < $< > $@
 

diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in
index b9f1ba775b6b2dfbec1eaf6c6e6eaff364445d99..10a1bfd1370c32c9bfa51ca2a871d493938b8d88 100644 (file)
--- a/mi2mu/include/Makefile.in
+++ b/mi2mu/include/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# lib/include/Makefile.am.wild
+# 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
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+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
 

diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in
index e5f001379aa143df90ec2d79ace7621d048df7dc..8e8f9f535c600817509a3a225e8f1ec60c0ee675 100644 (file)
--- a/mutopia/J.S.Bach/Makefile.in
+++ b/mutopia/J.S.Bach/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# mutopia/J.S.Bach/Makefile.am.wild
+# 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
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 LYFILES = preludes-1.ly preludes-2.ly preludes-4.ly preludes-5.ly preludes-6.ly scsii-menuetto.ly wtk1-fugue1.ly wtk1-fugue2.ly wtk1-prelude1.ly
 TEXFILES = preludes.tex

diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in
index d217c71a80003e2367bca5f41f44657fa2661879..dc925d97cdf819a5ecbd9c89015d47666e4b88b2 100644 (file)
--- a/mutopia/Makefile.in
+++ b/mutopia/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# mutopia/Makefile.am.wild
+# Automatically generated from ./mutopia/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# mutopia/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,10 +97,11 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 SUBDIRS = J.S.Bach
 
-LYFILES = gallina.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly
+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
 M4FILES = dummy.m4
 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)

diff --git a/tex/Makefile.in b/tex/Makefile.in
index 209dac96d56fcbcfd3c03c8b3464b4897af5d3e5..09c27e43824d6683846fb56d2d32fcc430569d17 100644 (file)
--- a/tex/Makefile.in
+++ b/tex/Makefile.in
@@ -10,7 +10,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generated automatically by wild-perl 0.1# tex/Makefile.am.wild
+# Automatically generated from ./tex/Makefile.am.wild by autowild
+# Do not edit
+# Generated automatically by wild-perl 0.1
+# tex/Makefile.am.wild
 
 
 SHELL = /bin/sh
@@ -59,7 +62,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AUTOHEADER = @AUTOHEADER@
+AUTOGENERATE = @AUTOGENERATE@
 BISON = @BISON@
 CC = @CC@
 COMPILEINFO = @COMPILEINFO@
@@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@
 VERSION = @VERSION@
 YACC = @YACC@
 ZIP = @ZIP@
+absolute_builddir = @absolute_builddir@
 
 TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex
 EXTRA_DIST = Makefile.am.wild $(TEXFILES)