From: fred <fred>
Date: Sun, 24 Mar 2002 20:09:03 +0000 (+0000)
Subject: lilypond-0.1.53
X-Git-Tag: release/1.5.59~3247
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a4a5d26a6e48a8254d0d7b75748454b592bcff71;p=lilypond.git

lilypond-0.1.53
---

diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am
index 66c0e42433..9942fb2d00 100644
--- a/Documentation/Makefile.am
+++ b/Documentation/Makefile.am
@@ -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
diff --git a/Makefile.am b/Makefile.am
index c25099c607..09f1bcbe9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/bin/Makefile.am b/bin/Makefile.am
index fd301eba42..e571846fc1 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -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
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 12b5972e21..8942bdb91e 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -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
diff --git a/flower/Makefile.am b/flower/Makefile.am
index 5eeaa35c32..99167e4bc6 100644
--- a/flower/Makefile.am
+++ b/flower/Makefile.am
@@ -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
@@ -10,23 +8,30 @@
 #	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
diff --git a/flower/Makefile.am.wild b/flower/Makefile.am.wild
index 6ef3498d04..869fb332b5 100644
--- a/flower/Makefile.am.wild
+++ b/flower/Makefile.am.wild
@@ -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:
+
diff --git a/flower/include/Makefile.am b/flower/include/Makefile.am
index 5321765096..4602b2a2c5 100644
--- a/flower/include/Makefile.am
+++ b/flower/include/Makefile.am
@@ -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
diff --git a/flower/include/Makefile.am.wild b/flower/include/Makefile.am.wild
index 5eb2230874..9c1e9deff1 100644
--- a/flower/include/Makefile.am.wild
+++ b/flower/include/Makefile.am.wild
@@ -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:
 
diff --git a/init/Makefile.am b/init/Makefile.am
index 21e4f1a987..9d3d081e66 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -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
diff --git a/input/Makefile.am b/input/Makefile.am
index 1b6aa6bf03..e684494a8a 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -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
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5554677441..6bb5a17465 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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
diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am
index 25185ebf6b..1b8c110a78 100644
--- a/lib/include/Makefile.am
+++ b/lib/include/Makefile.am
@@ -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
diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am
index bcef2c017f..2bf88e7bca 100644
--- a/lily/include/Makefile.am
+++ b/lily/include/Makefile.am
@@ -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
diff --git a/make/Makefile.am b/make/Makefile.am
index 76713abe78..997ce5ec67 100644
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -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
diff --git a/mf/Makefile.am b/mf/Makefile.am
index 625a9a8808..cee785675f 100644
--- a/mf/Makefile.am
+++ b/mf/Makefile.am
@@ -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
diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am
index bffa487cb2..b18b5e4f9f 100644
--- a/mi2mu/Makefile.am
+++ b/mi2mu/Makefile.am
@@ -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
diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am
index ca22f222b5..d68e0d2c49 100644
--- a/mi2mu/include/Makefile.am
+++ b/mi2mu/include/Makefile.am
@@ -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
diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am
index f61b263308..f87f282ea2 100644
--- a/mutopia/J.S.Bach/Makefile.am
+++ b/mutopia/J.S.Bach/Makefile.am
@@ -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
diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am
index 25d76365b6..1ea267e280 100644
--- a/mutopia/Makefile.am
+++ b/mutopia/Makefile.am
@@ -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
diff --git a/tex/Makefile.am b/tex/Makefile.am
index 927786c873..292c059710 100644
--- a/tex/Makefile.am
+++ b/tex/Makefile.am
@@ -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