From 8437de9f9840db2227c0142408979c95c3118e5c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 17 Mar 1998 09:53:34 +0100 Subject: [PATCH] release: 0.1.50 --- COPYING | 2 +- Documentation/INSTALL.pod | 56 +- Documentation/Makefile.am | 16 +- Documentation/Makefile.am.wild | 10 +- Documentation/Makefile.in | 64 +- Documentation/Rules.make | 2 +- Documentation/faq.pod | 7 +- Documentation/ly2dvi.pod | 44 +- Makefile.am | 15 +- Makefile.am.wild | 10 +- Makefile.in | 434 ++--- NEWS | 19 + TODO | 8 +- VERSION | 2 +- acinclude.m4 | 2 +- aclocal.m4 | 271 ++- bin/Makefile.am | 13 +- bin/Makefile.am.wild | 4 +- bin/Makefile.in | 61 +- bin/add-URLs.in | 0 bin/autowild | 29 - bin/clean-diaper.in | 0 bin/clean-embeds.in | 0 bin/clean-fonts.in | 0 bin/conflily.in | 8 +- bin/convert-mudela.in | 0 bin/cvm.in | 0 bin/find-typenames.in | 0 bin/flower.py | 74 - bin/genheader.in | 0 bin/lilypython.py | 197 --- bin/ly2dvi.in | 144 +- bin/make-docxx.in | 0 bin/make-examples.in | 0 bin/make-patch.in | 2 +- bin/make-version.in | 0 bin/make-website.in | 22 +- bin/mf-deps.in | 3 +- bin/mf-to-table.in | 0 bin/mudela-book.in | 0 bin/release.in | 0 bin/show-latest.in | 0 bin/wild-perl | 7 + config.guess | 883 ++++++++++ config.sub | 954 +++++++++++ configure | 599 +++++-- configure.in | 33 +- debian/Makefile.am | 6 +- debian/Makefile.in | 54 +- flower/Makefile.am | 14 +- flower/Makefile.am.wild | 9 +- flower/Makefile.in | 417 +++-- flower/aclocal.m4 | 269 ++- flower/configure | 821 +++++----- flower/configure.in | 52 +- flower/cpu-timer.cc | 2 +- flower/include/Makefile.am | 6 +- flower/include/Makefile.in | 83 +- flower/include/libc-extension.hh | 2 + flower/test/Makefile.am | 6 +- flower/test/Makefile.in | 83 +- include/Makefile.in | 181 -- init/Makefile.am | 10 +- init/Makefile.in | 57 +- init/feta11.ly | 81 - init/feta13.ly | 81 - init/feta16.ly | 81 - init/feta19.ly | 81 - init/feta20.ly | 81 - init/feta23.ly | 81 - init/feta26.ly | 81 - init/script.ly | 7 + input/Makefile.am | 6 +- input/Makefile.in | 54 +- input/denneboom.ly | 234 ++- input/praeludium-fuga-E.ly | 8 +- lib/Makefile.am | 15 +- lib/Makefile.am.wild | 10 +- lib/Makefile.in | 261 +-- lib/include/Makefile.am | 6 +- lib/include/Makefile.in | 71 +- lib/simple-file-storage.cc | 4 + lily/Makefile.am | 11 +- lily/Makefile.am.wild | 4 +- lily/Makefile.in | 1329 +++++++-------- lily/VERSION | 2 +- lily/include/Makefile.am | 8 +- lily/include/Makefile.in | 73 +- lily/include/linear-programming.hh | 42 + lily/include/swallow-grav.hh | 1 - lily/include/tie-grav.hh | 1 - lily/lily-version.cc | 2 +- lily/linear-programming.cc | 90 + lily/tex-slur.cc | 5 +- lily/tie-grav.cc | 9 +- ltconfig | 1520 +++++++++++++++++ ltmain.sh | 2446 ++++++++++++++++++++++++++++ make/Makefile.am | 6 +- make/Makefile.in | 54 +- make/Targets.make | 2 +- make/Variables.make | 2 +- make/lelievijver.lsm | 2 +- make/lilypond.lsm | 2 +- make/lilypond.spec | 4 +- mf/Makefile.am | 16 +- mf/Makefile.am.wild | 9 +- mf/Makefile.in | 64 +- mf/feta-generic.mf | 3 +- mf/feta-schrift.mf | 3 + mf/feta-sleur.mf | 77 +- mi2mu/Makefile.am | 12 +- mi2mu/Makefile.am.wild | 7 +- mi2mu/Makefile.in | 203 ++- mi2mu/include/Makefile.am | 6 +- mi2mu/include/Makefile.in | 71 +- mutopia/J.S.Bach/Makefile.am | 6 +- mutopia/J.S.Bach/Makefile.in | 54 +- mutopia/Makefile.am | 6 +- mutopia/Makefile.in | 86 +- mutopia/standchen.ly | 34 +- mutopia/standje.ly | 100 +- test/Makefile.in | 200 --- tex/Makefile.am | 10 +- tex/Makefile.in | 57 +- tex/feta11.tex | 80 - tex/feta13.tex | 80 - tex/feta16.tex | 80 - tex/feta19.tex | 80 - tex/feta20.tex | 80 - tex/feta23.tex | 80 - tex/feta26.tex | 80 - 131 files changed, 9912 insertions(+), 4597 deletions(-) mode change 100644 => 100755 bin/Makefile.am.wild mode change 100644 => 100755 bin/add-URLs.in delete mode 100755 bin/autowild mode change 100644 => 100755 bin/clean-diaper.in mode change 100644 => 100755 bin/clean-embeds.in mode change 100644 => 100755 bin/clean-fonts.in mode change 100644 => 100755 bin/conflily.in mode change 100644 => 100755 bin/convert-mudela.in mode change 100644 => 100755 bin/cvm.in mode change 100644 => 100755 bin/find-typenames.in delete mode 100644 bin/flower.py mode change 100644 => 100755 bin/genheader.in delete mode 100644 bin/lilypython.py mode change 100644 => 100755 bin/ly2dvi.in mode change 100644 => 100755 bin/make-docxx.in mode change 100644 => 100755 bin/make-examples.in mode change 100644 => 100755 bin/make-patch.in mode change 100644 => 100755 bin/make-version.in mode change 100644 => 100755 bin/make-website.in mode change 100644 => 100755 bin/mf-deps.in mode change 100644 => 100755 bin/mf-to-table.in mode change 100644 => 100755 bin/mudela-book.in mode change 100644 => 100755 bin/release.in mode change 100644 => 100755 bin/show-latest.in mode change 100644 => 100755 bin/wild-perl create mode 100755 config.guess create mode 100755 config.sub delete mode 100644 include/Makefile.in delete mode 100644 init/feta11.ly delete mode 100644 init/feta13.ly delete mode 100644 init/feta16.ly delete mode 100644 init/feta19.ly delete mode 100644 init/feta20.ly delete mode 100644 init/feta23.ly delete mode 100644 init/feta26.ly create mode 100644 lily/include/linear-programming.hh create mode 100644 lily/linear-programming.cc create mode 100644 ltconfig create mode 100644 ltmain.sh delete mode 100644 test/Makefile.in delete mode 100644 tex/feta11.tex delete mode 100644 tex/feta13.tex delete mode 100644 tex/feta16.tex delete mode 100644 tex/feta19.tex delete mode 100644 tex/feta20.tex delete mode 100644 tex/feta23.tex delete mode 100644 tex/feta26.tex diff --git a/COPYING b/COPYING index 77b1b7108a..e144c3ebba 100644 --- a/COPYING +++ b/COPYING @@ -3,7 +3,7 @@ *** NOTE This license applies to all files except the included example -input files (which are in the subdirectory input/ ) +input files (which are in the subdirectory input/ and mutopia/ ) *** END NOTE diff --git a/Documentation/INSTALL.pod b/Documentation/INSTALL.pod index 4faa314e9e..7f032b20ea 100644 --- a/Documentation/INSTALL.pod +++ b/Documentation/INSTALL.pod @@ -34,17 +34,6 @@ work in Windows NT/95, but we don't promise to support it. GNU C++ version 2.7 or newer (yes, 2.8 is fine). -=item * - -GNU make. - -=item * - -Flex (version 2.5.1 or newer). - -=item * - -Bison (version 1.25 or newer). =back @@ -67,7 +56,6 @@ Ghostscript installed. =back - =head1 RECOMMENDED Although not strictly necessary, these are recommended to have. @@ -76,6 +64,17 @@ Although not strictly necessary, these are recommended to have. =item * +GNU make. + +=item * + +Flex (version 2.5.1 or newer). + +=item * + +Bison (version 1.25 or newer). +=item * + Perl-5. Most documentation was created with the perl's Plain Old Documentation. (I use 5.003) @@ -176,10 +175,6 @@ Set then directory TeX input is in (detected as a subdir of tex-prefix) Set the directory mf input is in (idem) -=item B<--enable-out-dir> - -Set the directory for machine generated output. - =back All options are documented in the F help @@ -193,35 +188,6 @@ everything will be compiled, but nothing will be installed. The resulting binaries can be found in the subdirectories F (which contain all files generated during compilation). -=head2 Building for multiple hosts - -LilyPond does not follow the GNU standards when it comes to -configuring and making Makefiles. In LilyPond, F generates -I output in output directories (called F, by default). You -can have multiple compiles from the same source-tree, by overriding -the setting for the output directory. - -Example: on my system, I do debugging and lots compiling. For this I -use the configuration as follows: - - configure --prefix=~ --enable-debugging --enable-printing --enable-checking - make all - -and I want to do profiling. For that I use - - configure --prefix=~ --enable-debugging --disable-printing\ - --disable-checking --enable-profiling --enable-optimise\ - --enable-out-dir=out-profile - - make OUTDIR_NAME=out-profile all - -These two commands build two entirely separate versions of -LilyPond. In Real Life, you would probably also want to have two -different prefixes. On my machine this is no problem; I never do -C. My prefix dirs are linked back to my source -directory. - - =head1 INSTALLING If you have done a successful C, then a simple diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am index cfa8e12858..1e2fa6472b 100644 --- a/Documentation/Makefile.am +++ b/Documentation/Makefile.am @@ -1,6 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/Documentation/Makefile.am.wild by bin/autowild -# Do not edit -# Documentation/Makefile.am.wild +# Generated automatically by wild-perl 0.1# Documentation/Makefile.am.wild 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 @@ -22,11 +20,17 @@ default: all $(TEXTFILES) outdir = . -install-data: $(outdir)/lilypond.1 +install-data-hook: $(MAN1GROFF) $(INSTALL) -d $(mandir)/man1 $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1 -uninstall-data: +uninstall-hook: (cd $(mandir)/man1/; rm -f $(MAN1GROFF)) -include Rules.make +html: $(HTMLFILES) + +clean-hook: + rm $(TEXTFILES) $(MAN1GROFF) + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/Documentation/Makefile.am.wild b/Documentation/Makefile.am.wild index bed4314551..c7549e1c49 100644 --- a/Documentation/Makefile.am.wild +++ b/Documentation/Makefile.am.wild @@ -20,11 +20,15 @@ default: all $(TEXTFILES) outdir = . -install-data: $(outdir)/lilypond.1 +install-data-hook: $(MAN1GROFF) $(INSTALL) -d $(mandir)/man1 $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1 -uninstall-data: +uninstall-hook: (cd $(mandir)/man1/; rm -f $(MAN1GROFF)) -include Rules.make +html: $(HTMLFILES) + +clean-hook: + rm $(TEXTFILES) $(MAN1GROFF) + diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index 9e8347dcae..0c9c750b93 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./Documentation/Makefile.am.wild by bin/autowild -# Do not edit -# Documentation/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# Documentation/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -146,6 +156,7 @@ install-exec: install-data: @$(NORMAL_INSTALL) + $(MAKE) install-data-hook install: install-exec install-data all @: @@ -160,25 +171,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -192,14 +204,20 @@ mostlyclean distclean maintainer-clean default: all $(TEXTFILES) -install-data: $(outdir)/lilypond.1 +install-data-hook: $(MAN1GROFF) $(INSTALL) -d $(mandir)/man1 $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1 -uninstall-data: +uninstall-hook: (cd $(mandir)/man1/; rm -f $(MAN1GROFF)) -include Rules.make +html: $(HTMLFILES) + +clean-hook: + rm $(TEXTFILES) $(MAN1GROFF) + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Documentation/Rules.make b/Documentation/Rules.make index 37c33b2b34..b87154941d 100644 --- a/Documentation/Rules.make +++ b/Documentation/Rules.make @@ -19,7 +19,7 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex mv $(notdir $@) $(outdir) $(outdir)/%.mudtex: %.doc - $(binout)/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $< + $(depth)/$(bin)/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $< $(outdir)/%.txt: $(outdir)/%.1 troff -man -Tascii $< | grotty -b -u -o > $@ diff --git a/Documentation/faq.pod b/Documentation/faq.pod index 1237bf4a36..a78f05e809 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -180,10 +180,9 @@ elements.) Q: Do you support multiple staff-sizes? -A: Yes and no. At this time you can choose between 16 or 20 pt -staff-size (you can have other sizes, but you need to tinker with the -fonts to get those). The sizes can't be changed per staff (yet). -Look at F for an example. +A: Yes and no. At this time you can choose between 11, 13, 16, 19, +20, 23 and 20 pt staff-size. The sizes can't be changed per staff +(yet). Look at F for an example. =head2 How do I .... diff --git a/Documentation/ly2dvi.pod b/Documentation/ly2dvi.pod index 7c2132b777..c9a749d710 100644 --- a/Documentation/ly2dvi.pod +++ b/Documentation/ly2dvi.pod @@ -9,12 +9,12 @@ ly2dvi - convert mudela to DVI =head1 DESCRIPTION ly2dvi is a shell script which creates input file for LaTeX, -based on information from the output file(s) from lilypond. +based on information from the output files from lilypond. The script handles multiple files. If a mudela file name is specified lilypond is run to make an output (TeX) file. One or more LaTeX files are created, based on information found -in the output (TeX) file(s), and latex is finally run to create +in the output (TeX) files, and latex is finally run to create one or more DVI files. =head1 OPTIONS @@ -93,11 +93,11 @@ Specify the width (pt, mm or cm) of the printed lines. =item B -Additional directories for the input file(s). +Additional directories for input files. =item B -Temporary directory. Default is /tmp +Temporary directory name. Default is /tmp =back @@ -131,9 +131,43 @@ Name of the instrument, leftflushed at same level as the composer. =back +F +are files to set up default running conditions/variables, Bourne shell +syntax. All files are parsed, in the shown sequence. The variables are +overridden by variables in the mudela file, and by command line options. +In the current version the following are allowed: + +=over 5 + +=item B + +Set orientation - portrait is the default. + +=item B + +Specify LaTeX language. + +=item B + +Set output directory. + +=item B + +Specify papersize. + +=item B + +Additional directories for input files. + +=item B + +Temporary directory name. + +=back + =head1 SEE ALSO -lilypond(1), TeX, LaTeX +lilypond(1), tex(1), latex(1) =head1 AUTHOR diff --git a/Makefile.am b/Makefile.am index a1d81edeaf..9705f3e659 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,6 @@ -# Automatically generated from ./lilypond-0.1.49/Makefile.am.wild by bin/autowild -# Do not edit -######################################################## -# project LilyPond -- the musical typesetter +# Generated automatically by wild-perl 0.1 # title top level makefile for LilyPond # file Makefile.am.wild -# -# Copyright (c) 1997 by -# Jan Nieuwenhuizen -# Han-Wen Nienhuys SUBDIRS = bin flower lib lily mf mi2mu debian\ Documentation init input tex make mutopia @@ -18,8 +11,6 @@ README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \ INSTALL AUTHORS PATCHES EXTRA_DIST = Makefile.am.wild .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN) -dist-hook: - bin/autowild INSTALL: rm -f INSTALL @@ -33,3 +24,7 @@ PATCHES: rm -f PATCHES ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ + + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/Makefile.am.wild b/Makefile.am.wild index abb580c4e9..3013ee87f6 100644 --- a/Makefile.am.wild +++ b/Makefile.am.wild @@ -1,11 +1,5 @@ -######################################################## -# project LilyPond -- the musical typesetter # title top level makefile for LilyPond # file Makefile.am.wild -# -# Copyright (c) 1997 by -# Jan Nieuwenhuizen -# Han-Wen Nienhuys SUBDIRS = bin flower lib lily mf mi2mu debian\ Documentation init input tex make mutopia @@ -16,8 +10,6 @@ README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \ INSTALL AUTHORS PATCHES EXTRA_DIST = Makefile.am.wild .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN) -dist-hook: - bin/autowild INSTALL: rm -f INSTALL @@ -31,3 +23,5 @@ PATCHES: rm -f PATCHES ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ + + diff --git a/Makefile.in b/Makefile.in index 0827df92a2..bcf8a0234a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,19 +1,18 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./flower/Makefile.am.wild by bin/autowild -# Do not edit -# project FlowerSoft C++ library -# title top level makefile for FlowerLib -# file flower/Makefile.am.wild -# -# Copyright (c) 1997 by -# Jan Nieuwenhuizen -# Han-Wen Nienhuys -# ...your sort order here, or how to comment-out a comment +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 +# title top level makefile for LilyPond +# file Makefile.am.wild SHELL = /bin/sh @@ -47,78 +46,79 @@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AUTOHEADER = @AUTOHEADER@ +BISON = @BISON@ CC = @CC@ +COMPILEINFO = @COMPILEINFO@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -LIB_SUFFIX = @LIB_SUFFIX@ +CXXFLAGS = @CXXFLAGS@ +DEFINES = @DEFINES@ +DIR_DATADIR = @DIR_DATADIR@ +EXTRA_LIBES = @EXTRA_LIBES@ +FIND = @FIND@ +FLEX = @FLEX@ +ICFLAGS = @ICFLAGS@ +ILDFLAGS = @ILDFLAGS@ +LD = @LD@ +LEX = @LEX@ +LIBTOOL = @LIBTOOL@ +LN = @LN@ +LN_S = @LN_S@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ -MODULE_CXXFLAGS = @MODULE_CXXFLAGS@ -MODULE_LDFLAGS = @MODULE_LDFLAGS@ +MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ +PERL = @PERL@ +POD2HTML = @POD2HTML@ +POD2MAN = @POD2MAN@ +PYTHON = @PYTHON@ RANLIB = @RANLIB@ +TAR = @TAR@ +TEXDIR = @TEXDIR@ +TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ +YACC = @YACC@ +ZIP = @ZIP@ -SUBDIRS = include test - -lib_LIBRARIES = libflower.a -# lib_LIBRARIES = libflower.la +SUBDIRS = bin flower lib lily mf mi2mu debian\ + Documentation init input tex make mutopia -README_FILES = ONEWS NEWS README TODO VERSION -EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) - -libflower_a_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc - -INCLUDES = -Iinclude +SCHRIFTEN = configure configure.in install-sh aclocal.m4 +README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \ + COPYING ONEWS NEWS README TODO \ + INSTALL AUTHORS PATCHES +EXTRA_DIST = Makefile.am.wild .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -CONFIG_HEADER = config.hh +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ./lib/config.hh CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I. -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -libflower_a_LIBADD = -libflower_a_OBJECTS = choleski.o cpu-timer.o data-file.o \ -diagonal-storage.o dictionary.o directed-graph.o dstream.o \ -flower-debug.o flower-version.o full-storage.o interval.o lgetopt.o \ -libc-extension.o matrix-debug.o matrix-storage.o matrix.o nscalar.o \ -path.o rational.o scalar.o string-convert.o string.o stringutil.o \ -text-db.o text-stream.o unionfind.o vector.o -AR = ar -CXXFLAGS = @CXXFLAGS@ -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO aclocal.m4 config.hh.in configure configure.in \ -missing mkinstalldirs stamp-h.in +Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \ +configure configure.in install-sh ltconfig ltmain.sh missing \ +mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar GZIP = --best -SOURCES = $(libflower_a_SOURCES) -OBJECTS = $(libflower_a_OBJECTS) - default: all .SUFFIXES: -.SUFFIXES: .c .cc .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile @@ -126,7 +126,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in +$(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure @@ -134,78 +134,6 @@ config.status: $(srcdir)/configure $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -config.hh: stamp-h -stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.hh:config.hh.in \ - $(SHELL) ./config.status - @echo timestamp > stamp-h -$(srcdir)/config.hh.in: $(srcdir)/stamp-h.in -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - rm -f config.hh - -maintainer-clean-hdr: - -mostlyclean-libLIBRARIES: - -clean-libLIBRARIES: - test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) - -distclean-libLIBRARIES: - -maintainer-clean-libLIBRARIES: - -install-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(libdir) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \ - $(INSTALL_DATA) $$p $(libdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(RANLIB) $(libdir)/$$p"; \ - $(RANLIB) $(libdir)/$$p; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - $(NORMAL_UNINSTALL) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - rm -f $(libdir)/$$p; \ - done - -.c.o: - $(COMPILE) -c $< - -mostlyclean-compile: - rm -f *.o core - -clean-compile: - -distclean-compile: - rm -f *.tab.c - -maintainer-clean-compile: - -libflower.a: $(libflower_a_OBJECTS) $(libflower_a_DEPENDENCIES) - rm -f libflower.a - $(AR) cru libflower.a $(libflower_a_OBJECTS) $(libflower_a_LIBADD) - $(RANLIB) libflower.a -.cc.o: - $(CXXCOMPILE) -c $< - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -219,7 +147,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -229,7 +157,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -243,24 +173,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -271,7 +206,7 @@ top_distdir = $(distdir) # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - rm -rf $(distdir) + -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -284,20 +219,20 @@ distcheck: dist && $(MAKE) install \ && $(MAKE) installcheck \ && $(MAKE) dist - rm -rf $(distdir) + -rm -rf $(distdir) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" dist: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) distdir: $(DISTFILES) - rm -rf $(distdir) + -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ @@ -306,209 +241,102 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -choleski.o choleski.lo: choleski.cc include/choleski.hh \ - include/matrix.hh include/matrix-storage.hh include/varray.hh \ - include/real.hh include/virtual-methods.hh include/vector.hh -cpu-timer.o cpu-timer.lo: cpu-timer.cc include/cpu-timer.hh \ - include/real.hh -data-file.o data-file.lo: data-file.cc include/international.hh \ - include/data-file.hh include/text-stream.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh include/compare.hh \ - include/varray.hh -diagonal-storage.o diagonal-storage.lo: diagonal-storage.cc \ - include/diagonal-storage.hh include/full-storage.hh \ - include/varray.hh include/matrix-storage.hh include/real.hh \ - include/virtual-methods.hh include/full-storage.icc -dictionary.o dictionary.lo: dictionary.cc -directed-graph.o directed-graph.lo: directed-graph.cc \ - include/directed-graph.hh include/parray.hh include/varray.hh -dstream.o dstream.lo: dstream.cc include/assoc.hh include/varray.hh \ - include/dstream.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh include/scalar.hh \ - include/text-db.hh include/data-file.hh include/text-stream.hh \ - include/string-convert.hh include/assoc-iter.hh -flower-debug.o flower-debug.lo: flower-debug.cc include/flower-debug.hh \ - include/dstream.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh -flower-version.o flower-version.lo: flower-version.cc config.hh -full-storage.o full-storage.lo: full-storage.cc include/full-storage.hh \ - include/varray.hh include/matrix-storage.hh include/real.hh \ - include/virtual-methods.hh include/full-storage.icc -interval.o interval.lo: interval.cc include/interval.hh \ - include/fproto.hh include/real.hh include/compare.hh \ - include/interval.tcc include/string.hh \ - include/arithmetic-operator.hh include/string-handle.hh \ - include/international.hh include/flower-debug.hh \ - include/dstream.hh -lgetopt.o lgetopt.lo: lgetopt.cc include/lgetopt.hh \ - include/international.hh -libc-extension.o libc-extension.lo: libc-extension.cc \ - include/libc-extension.hh include/fproto.hh include/real.hh \ - config.hh -matrix-debug.o matrix-debug.lo: matrix-debug.cc include/flower-debug.hh \ - include/dstream.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh include/matrix.hh \ - include/matrix-storage.hh include/varray.hh \ - include/virtual-methods.hh include/vector.hh -matrix-storage.o matrix-storage.lo: matrix-storage.cc \ - include/full-storage.hh include/varray.hh \ - include/matrix-storage.hh include/real.hh \ - include/virtual-methods.hh include/diagonal-storage.hh -matrix.o matrix.lo: matrix.cc include/matrix.hh \ - include/matrix-storage.hh include/varray.hh include/real.hh \ - include/virtual-methods.hh include/vector.hh \ - include/full-storage.hh include/diagonal-storage.hh -nscalar.o nscalar.lo: nscalar.cc -path.o path.lo: path.cc include/path.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh include/varray.hh \ - include/flower-debug.hh include/dstream.hh -rational.o rational.lo: rational.cc include/rational.hh \ - include/compare.hh include/arithmetic-operator.hh \ - include/fproto.hh include/real.hh include/string.hh \ - include/string-handle.hh include/international.hh \ - include/string-convert.hh include/libc-extension.hh config.hh -scalar.o scalar.lo: scalar.cc include/scalar.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh include/rational.hh -string-convert.o string-convert.lo: string-convert.cc \ - include/libc-extension.hh include/fproto.hh include/real.hh \ - config.hh include/string.hh include/arithmetic-operator.hh \ - include/string-handle.hh include/international.hh \ - include/compare.hh include/string-convert.hh \ - include/rational.hh -string.o string.lo: string.cc include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh \ - include/libc-extension.hh config.hh include/string-convert.hh -stringutil.o stringutil.lo: stringutil.cc include/string-handle.hh \ - include/fproto.hh include/real.hh include/string-data.hh \ - include/string.hh include/arithmetic-operator.hh \ - include/international.hh include/compare.hh \ - include/string-data.icc include/string-handle.icc \ - include/string.icc -text-db.o text-db.lo: text-db.cc include/text-db.hh include/data-file.hh \ - include/text-stream.hh include/string.hh \ - include/arithmetic-operator.hh include/fproto.hh \ - include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh include/varray.hh -text-stream.o text-stream.lo: text-stream.cc include/text-stream.hh \ - include/string.hh include/arithmetic-operator.hh \ - include/fproto.hh include/real.hh include/string-handle.hh \ - include/international.hh include/compare.hh include/varray.hh -unionfind.o unionfind.lo: unionfind.cc include/unionfind.hh \ - include/varray.hh -vector.o vector.lo: vector.cc include/vector.hh include/real.hh \ - include/varray.hh - info: info-recursive dvi: dvi-recursive check: all-am $(MAKE) check-recursive installcheck: installcheck-recursive -all-recursive-am: config.hh - $(MAKE) all-recursive - -all-am: Makefile $(LIBRARIES) config.hh - -install-exec-am: install-libLIBRARIES +all-am: Makefile -uninstall-am: uninstall-libLIBRARIES - -install-exec: install-exec-recursive install-exec-am +install-exec: install-exec-recursive @$(NORMAL_INSTALL) install-data: install-data-recursive @$(NORMAL_INSTALL) -install: install-recursive install-exec-am +install: install-recursive @: -uninstall: uninstall-recursive uninstall-am +uninstall: uninstall-recursive -all: all-recursive-am all-am +all: all-recursive all-am install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: installdirs-recursive - $(mkinstalldirs) $(libdir) mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-hdr mostlyclean-libLIBRARIES \ - mostlyclean-compile mostlyclean-tags \ - mostlyclean-generic + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean-am: mostlyclean-tags mostlyclean-generic -clean-am: clean-hdr clean-libLIBRARIES clean-compile clean-tags \ - clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am -distclean-am: distclean-hdr distclean-libLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status - -.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ -maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \ -clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ -install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ + -rm -f config.status + +.PHONY: default install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-recursive-am all-am install-exec-am uninstall-am \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +installcheck all-am install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +INSTALL: + rm -f INSTALL + ln `$(FIND) ./ -name INSTALL.txt -print | head -1` $@ + +AUTHORS: + rm -f AUTHORS + ln `$(FIND) ./ -name AUTHORS.txt -print | head -1` $@ + +PATCHES: + rm -f PATCHES + ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/NEWS b/NEWS index 3c15094815..22e3ed57cb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +pl 50 + - deprecate autowild + - --srcdir fixes + - ly2dvi 0.8 + +pl 49jcn2 + - static (default) and/or shared libs flower and lily + - patch from AO 'libtool 1.1.1' + - mf: trill-symbols: feta-slag.mf + +pl 49.jcn1 + - shared libs (ugh: hardcoded switch in configure set to static) + - some fixes: denneboom.ly, standje.ly/standchen.ly + +******** +march 19 + pl 49 - parser assert changed to warning - fix stdin reading @@ -18,6 +35,7 @@ pl 48.jcn5 - automake ****** +march 12 pl 48 - Pitch_squash_engraver makes Rhythmic_staff possible. - some fixes to buildscripts for sgi irix @@ -39,6 +57,7 @@ pl 47.jcn1 - mudela-book: added center option ****** +march 6 pl 47 - Abbreviation now a separate item. - bf'd some gcc 2.8 warnings. diff --git a/TODO b/TODO index b981bc6640..77ad05afaa 100644 --- a/TODO +++ b/TODO @@ -8,12 +8,18 @@ grep for TODO and ugh/ugr 0.2: + * latex quirk? + * check for groff / troff/ nroff et * use kpsepath to find all TeX dirs - configure.in - clean-fonts.sh - + + * fix MIDI + + * mudela-convert. + * nicen examples: - remove all \multi - break-up heavily-nested score blocks diff --git a/VERSION b/VERSION index 0422161a66..470aa1e14b 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=49 +PATCH_LEVEL=50 MY_PATCH_LEVEL= # now used as shell script in configure too diff --git a/acinclude.m4 b/acinclude.m4 index 8c45edc944..d6db5c9554 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -37,7 +37,7 @@ AC_DEFUN(AC_TEX_PREFIX, [ find_texprefix="$find_root_prefix/$find_texpostfix" # only assign if variablename not empty - if test x != "x$1"; then + if test x != "x[$]$1"; then $1='${prefix}'/"$find_texpostfix" fi AC_MSG_RESULT($find_texprefix) diff --git a/aclocal.m4 b/aclocal.m4 index c4b1fdc5e2..3997befc4e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,14 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2 +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. AC_DEFUN(AC_JUNK_ARGS, [ @@ -39,7 +49,7 @@ AC_DEFUN(AC_TEX_PREFIX, [ find_texprefix="$find_root_prefix/$find_texpostfix" # only assign if variablename not empty - if test x != "x$1"; then + if test x != "x[$]$1"; then $1='${prefix}'/"$find_texpostfix" fi AC_MSG_RESULT($find_texprefix) @@ -109,8 +119,8 @@ fi ifelse([$3],, AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) -AM_SANITY_CHECK -AC_ARG_PROGRAM +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) @@ -118,7 +128,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_PROG_MAKE_SET]) +AC_REQUIRE([AC_PROG_MAKE_SET])]) # serial 1 @@ -145,10 +155,21 @@ 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 @@ -177,6 +198,244 @@ else 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 &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, diff --git a/bin/Makefile.am b/bin/Makefile.am index 5b8192bf6c..1ddb8a8dc9 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,10 +1,11 @@ -# Automatically generated from ./lilypond-0.1.49/bin/Makefile.am.wild by bin/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 conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in +# bin_SCRIPTS = -PAREL_SCHRIFTEN = flower.py lilypython.py -IN_SCHRIFTEN = flower.py lilypython.py -EXTRA_DIST = Makefile.am.wild autowild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +PAREL_SCHRIFTEN = +IN_SCHRIFTEN = +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/bin/Makefile.am.wild b/bin/Makefile.am.wild old mode 100644 new mode 100755 index ba97f091a2..29e882ac19 --- a/bin/Makefile.am.wild +++ b/bin/Makefile.am.wild @@ -2,7 +2,7 @@ # bin_SCRIPTS = $(wildcard *.in) -PAREL_SCHRIFTEN = $(wildcard *.py) +PAREL_SCHRIFTEN = $(wildcard *.pl) IN_SCHRIFTEN = $(wildcard *.py) -EXTRA_DIST = Makefile.am.wild autowild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl diff --git a/bin/Makefile.in b/bin/Makefile.in index edff79e6a3..775180c1d2 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,14 +1,19 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./bin/Makefile.am.wild by bin/autowild -# Do not edit +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 # bin/Makefile -# bin_SCRIPTS = Makefile.in add-URLs.in clean-diaper.in clean-embeds.in clean-fonts.in conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in +# bin_SCRIPTS = SHELL = /bin/sh @@ -49,12 +54,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -69,11 +76,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -87,9 +98,9 @@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ -PAREL_SCHRIFTEN = flower.py lilypython.py -IN_SCHRIFTEN = flower.py lilypython.py -EXTRA_DIST = Makefile.am.wild autowild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +PAREL_SCHRIFTEN = +IN_SCHRIFTEN = +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = add-URLs clean-diaper clean-embeds clean-fonts \ @@ -200,25 +211,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -230,6 +242,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/bin/add-URLs.in b/bin/add-URLs.in old mode 100644 new mode 100755 diff --git a/bin/autowild b/bin/autowild deleted file mode 100755 index b3f5404ed9..0000000000 --- a/bin/autowild +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# autowild -# for those of you that have no wild-automake - -# ugh -verbose=true -if test x$1 = x-v; then - verbose=echo -fi - -#ugh -# PERL=@PERL@ -PERL=/usr/bin/perl - -WILD_MAKEFILES=$(find . -name \*.wild) -for i in $WILD_MAKEFILES; do - dir=$(dirname $i) - wild=$(basename $i) - make=$(basename $i .wild) - $verbose "autowild: creating $dir/$make" - TOPDIR=`pwd` - (cd $dir - rm -f $make - echo "# Automatically generated from $i by $0" > $make - echo "# Do not edit" >> $make - cat $wild | $PERL $TOPDIR/bin/wild-perl >> $make - ) -done - diff --git a/bin/clean-diaper.in b/bin/clean-diaper.in old mode 100644 new mode 100755 diff --git a/bin/clean-embeds.in b/bin/clean-embeds.in old mode 100644 new mode 100755 diff --git a/bin/clean-fonts.in b/bin/clean-fonts.in old mode 100644 new mode 100755 diff --git a/bin/conflily.in b/bin/conflily.in old mode 100644 new mode 100755 index a89f9e7711..f175c17586 --- a/bin/conflily.in +++ b/bin/conflily.in @@ -22,13 +22,13 @@ current=`basename \`pwd\`` echo ln -s $lelie/$current $lelie/current ln -s $lelie/$current $lelie/current -ln -sf $lelie/current/lily/out/lilypond bin/out/lilypond -ln -sf $lelie/current/mi2mu/out/mi2mu bin/out/mi2mu +ln -sf $lelie/current/lily/lilypond bin/lilypond +ln -sf $lelie/current/mi2mu/mi2mu bin/mi2mu if [ "x$LILYINCLUDE" = "x" ]; then echo you should make add the following to your login script - echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/input:$lelie/current/mutopia:$lelie/current/mutopia/out:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:$lelie/current/mutopia/J.S.Bach/out" - echo "export PATH=$PATH:$lelie/current/bin/out/" + echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/mutopia:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:" + echo "export PATH=$PATH:$lelie/current/bin" echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf" fi diff --git a/bin/convert-mudela.in b/bin/convert-mudela.in old mode 100644 new mode 100755 diff --git a/bin/cvm.in b/bin/cvm.in old mode 100644 new mode 100755 diff --git a/bin/find-typenames.in b/bin/find-typenames.in old mode 100644 new mode 100755 diff --git a/bin/flower.py b/bin/flower.py deleted file mode 100644 index c7af8dd307..0000000000 --- a/bin/flower.py +++ /dev/null @@ -1,74 +0,0 @@ -#!@PYTHON@ - -# -# flower.py -- python flower lib -# -# source file of the GNU LilyPond music typesetter -# -# (c) 1997 Han-Wen Nienhuys -# - -class File: - """silly wrapper for Python file object.""" - def __init__ (self,nm, mode='r'): - if nm: - self.file_ = open (nm, mode); - elif mode == 'w': - self.file_ = sys.stdout - else: - self.file_ = sys.stdin - - self.eof_ = 0; - def readline (self): - l= self.file_.readline (); - if not l: - self.eof_ = 1; - return l; - def write (self, str): - self.file_.write (str) - def eof (self): - return self.eof_ - def close (self): - self.file_.close () - def __del__ (self): - self.close (); - - - -import fnmatch -import os - -_debug = 0 - -_prune = ['(*)'] - - -def my_find(patterns, dir = os.curdir): - list = [] - names = os.listdir(dir) - names.sort() - for name in names: - if name in (os.curdir, os.pardir): - continue - fullname = os.path.join(dir, name) - for pat in patterns: - if fnmatch.fnmatch(name, pat): - list.append(fullname) - if os.path.isdir(fullname) and not os.path.islink(fullname): - for p in _prune: - if fnmatch.fnmatch(name, p): - if _debug: print "skip", `fullname` - break - else: - if _debug: print "descend into", `fullname` - found = my_find(patterns, fullname) - if found: - list = list + found - return list - -def multiple_find(pats, dirnames): - from find import find - l = [] - for d in dirnames: - l = l + my_find(pats, d) - return l diff --git a/bin/genheader.in b/bin/genheader.in old mode 100644 new mode 100755 diff --git a/bin/lilypython.py b/bin/lilypython.py deleted file mode 100644 index 06ad6459d5..0000000000 --- a/bin/lilypython.py +++ /dev/null @@ -1,197 +0,0 @@ -#!/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 -# - -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 - - diff --git a/bin/ly2dvi.in b/bin/ly2dvi.in old mode 100644 new mode 100755 index e20f85aa11..ac70e37209 --- a/bin/ly2dvi.in +++ b/bin/ly2dvi.in @@ -8,13 +8,19 @@ # Original LaTeX file made by Mats Bengtsson, 17/8 1997 # -VERSION="0.7" +VERSION="0.8" NAME=ly2dvi.sh IDENTIFICATION="$NAME $VERSION" NOW=`date` echo "$IDENTIFICATION" 1>&2 -# TODO +# NEWS + +# 0.8 - Trap Lilypond segmentation fault +# - Function for cleanup +# - Trap line +# - More human-readable variables +# - Some logics concerning rc-files # 0.7 # - Improved Lilypond error checking @@ -26,12 +32,7 @@ echo "$IDENTIFICATION" 1>&2 #TODO # - Include more papersizes. # - Manual page....... -# - should detect crashing lilypond - - -# NEWS - -# 0.6.hwn1.jaf +# 0.6.jaf2 # - LILYINCLUDE update # # 0.6.hwn1 @@ -123,6 +124,18 @@ echo "$IDENTIFICATION" 1>&2 # - long option hack # - moved help into function +# +# Clean up +# +cleanup() { + $debug_echo "("$LF")("$FN")("$LOGFILE")" + if [ "$KEEP" != "Y" ] + then + [ -n "$LF" -a -f "$LF" ] && rm -f $LF + [ -n "$LOGFILE" -a -f "$LOGFILE" ] && rm -f $LOGFILE + [ -n "$FN" ] && rm -f $FN.* + fi +} # # print usage # @@ -144,7 +157,20 @@ Options: files may be (a mix of) input to or output from lilypond(1) EOF } - +# +# Trap function (cleanup) +# +trap cleanup 0 9 15 +# +# Various defaults +# +[ -z "$TMP" ] && TMP=/tmp +if [ ! -d $TMP ] +then + $debug_echo $IDENTIFICATION": temporary directory "$TMP" not found, set to /tmp" + TMP=/tmp +fi +LOGFILE=$TMP/lilylog.$$ # Logfile for lilypond PWIDTH=600; # Width of A4 paper! PHEIGTH=830; # Heigth of A4 paper! # @@ -155,8 +181,11 @@ do RCfile=$D"lilyrc" [ -f $RCfile ] && . $RCfile done - -# +fORI=$ORIENTATION +fLNG=$LANGUAGE +fPSZ=$PAPERSIZE +unset ORIENTATION LANGUAGE PAPERSIZE +# # Keywords defined in titledefs.tex # TF=`kpsewhich -n tex tex titledefs.tex` @@ -202,14 +231,11 @@ do $debug_echo "arg: \`$OPTARG'" case $O in D ) - if [ $debug_echo = echo ] - then - set -x - fi + [ $debug_echo = echo ] && set -x debug_echo=echo ;; O ) - ORI=$OPTARG + ORIENTATION=$OPTARG ;; h ) help; @@ -219,13 +245,13 @@ do KEEP=Y ;; l ) - LNG=$OPTARG + LANGUAGE=$OPTARG ;; o ) OUTPUTDIR=$OPTARG ;; p ) - PSZ=$OPTARG + PAPERSIZE=$OPTARG ;; s ) SEPFILE=Y @@ -239,10 +265,7 @@ do $debug_echo "long option: \`$OPTARG'" case "$OPTARG" in D*|-D*) - if [ $debug_echo = echo ] - then - set -x - fi + [ $debug_echo = echo ] && set -x debug_echo=echo ;; h*|-h*) @@ -253,13 +276,13 @@ do KEEP=Y ;; l*|-l*) - LNG=`echo $OPTARG | sed -e s/"^.*="//` + LANGUAGE=`echo $OPTARG | sed -e s/"^.*="//` ;; p*|-p*) - PSZ=`echo $OPTARG | sed -e s/"^.*="//` + PAPERSIZE=`echo $OPTARG | sed -e s/"^.*="//` ;; or*|-or*) - ORI=`echo $OPTARG | sed -e s/"^.*="//` + ORIENTATION=`echo $OPTARG | sed -e s/"^.*="//` ;; ou*|-ou*) OUTPUTDIR=`echo $OPTARG | sed -e s/"^.*="//` @@ -290,31 +313,19 @@ startFile(){ # # LaTeX file name # +BN=`basename $File .tex` +FN=$BN.$$ if [ "$KEEP" != "Y" ] then - if [ "$TMP" = "" ] - then - TMP=/tmp - fi - if [ ! -d $TMP ] - then - $debug_echo $IDENTIFICATION": temporary directory "$TMP" not found, set to /tmp" - TMP=/tmp - fi -# - BN=`basename $File .tex` - FN=$BN.$$ LF=$TMP/$FN.tex else - BN=`basename $File .tex` - FN=$BN.$$ LF=$FN.tex fi # # Find: -# paper size (PSZ, overridden by command line option -p) -# paper orientation (ORI, overridden by command line option -o) -# language (LNG, overridden by command line option -l) +# paper size (PAPERSIZE, overridden by command line option -p) +# paper orientation (ORIENTATION, overridden by option -o) +# language (LANGUAGE, overridden by option -l) # textwidth # eval `sed -n \\ @@ -323,41 +334,41 @@ eval `sed -n \\ -e 's/\\\\def\\\\mudelalanguage{\([^}]*\).*$/fLNG=\1;/p' \\ -e 's/\\\\def\\\\mudelapaperlinewidth{\([^}]*\).*$/TWN=\1;/p' \\ $File` -if [ -z "$PSZ" ] +if [ -z "$PAPERSIZE" ] then - PSZ=$fPSZ + PAPERSIZE=$fPSZ fi -if [ ! -z "$PSZ" ] +if [ -n "$PAPERSIZE" ] then - PAPEROPT=$PSZ + PAPEROPT=$PAPERSIZE fi # -if [ -z "$ORI" ] +if [ -z "$ORIENTATION" ] then - ORI=$fORI + ORIENTATION=$fORI fi -if [ ! -z "$ORI" ] +if [ -n "$ORIENTATION" ] then if [ -z "$PAPEROPT" ] then - PAPEROPT=$ORI + PAPEROPT=$ORIENTATION else - PAPEROPT=$PAPEROPT,$ORI + PAPEROPT=$PAPEROPT,$ORIENTATION fi fi # -if [ ! -z "$PAPEROPT" ] +if [ -n "$PAPEROPT" ] then PAPER="["$PAPEROPT"]" fi # -if [ -z "$LNG" ] +if [ -z "$LANGUAGE" ] then - LNG=$fLNG + LANGUAGE=$fLNG fi -if [ ! -z "$LNG" ] +if [ -n "$LANGUAGE" ] then - LLNG="\usepackage["$LNG"]{babel}" + LLNG="\usepackage["$LANGUAGE"]{babel}" else LLNG="%" fi @@ -365,7 +376,7 @@ fi # # Find textwidth # -if [ ! -z "$TWN" ] +if [ -n "$TWN" ] then TW=$TWN case $TW in @@ -383,7 +394,7 @@ then fi TWp=`echo $TW | sed -e 's/\..*$//'` PWp=$PWIDTH -if [ "$ORI" = "landscape" ] +if [ "$ORIENTATION" = "landscape" ] then PWp=$PHEIGTH fi @@ -451,18 +462,13 @@ latex $LF || exit 5 if [ -f $FN.dvi ] then RESULT=$BN.dvi - if [ x$OUTPUTDIR != x ]; then - RESULT="$OUTPUTDIR/$RESULT" - fi + [ -n "$OUTPUTDIR" ] && RESULT="$OUTPUTDIR/$RESULT" cp $FN.dvi $RESULT fi # # Clean up # -if [ "$KEEP" != "Y" ] -then - rm $LF $FN.* -fi +cleanup # # Output some info # @@ -542,12 +548,12 @@ do # $debug_echo "lilypond "$IF - lilypond $IF 2>&1 | tee /tmp/lilylog.$$ - OF=`egrep '^TeX output to ' /tmp/lilylog.$$ | \\ + lilypond $IF 2>&1 | tee $LOGFILE + OF=`egrep '^TeX output to ' $LOGFILE | \\ sed -e 's/TeX output to//' -e 's/\.\.\.//'` $debug_echo "==> "$OF - STATUS=`grep -i error /tmp/lilylog.$$` - rm /tmp/lilylog.$$ + STATUS=`egrep -i "error|segmentation" $LOGFILE` + echo $STATUS if [ ! -z "$STATUS" ] then exit 10 diff --git a/bin/make-docxx.in b/bin/make-docxx.in old mode 100644 new mode 100755 diff --git a/bin/make-examples.in b/bin/make-examples.in old mode 100644 new mode 100755 diff --git a/bin/make-patch.in b/bin/make-patch.in old mode 100644 new mode 100755 index 0f5ee3057d..5d052f95f7 --- a/bin/make-patch.in +++ b/bin/make-patch.in @@ -63,7 +63,7 @@ usage \n\ Patches do not contain automatically generated files, \n\ i.e. you should rerun configure\n\n' -pats = ['*.lsm', 'configure', '*.txt', 'lilypond.spec'] +pats = ['*.lsm', 'configure', '*.txt', 'lilypond.spec', 'Makefile.am', 'Makefile.in', 'lexer.cc', 'parser.cc'] def remove_automatic(dirnames): files = [] files = files + multiple_find(pats, dirnames) diff --git a/bin/make-version.in b/bin/make-version.in old mode 100644 new mode 100755 diff --git a/bin/make-website.in b/bin/make-website.in old mode 100644 new mode 100755 index 40420fb1d7..7820d45ff8 --- a/bin/make-website.in +++ b/bin/make-website.in @@ -1,5 +1,5 @@ #!@PYTHON@ -# +# -*-python-*- # make-website.py -- implement The lilypond WWW site # # source file of the GNU LilyPond music typesetter @@ -41,9 +41,9 @@ import glob depth = '' makewebsite_id = ""; -id_str = "make-website 0.8"; +id_str = "make-website 0.9"; tar = "tar"; -make = "make -f OLD-Makefile"; +make = "make -f Makefile"; mailaddress = "unknown" fullname = "unknown" footstr = "" @@ -56,7 +56,7 @@ def set_vars(): __main__.lilyversion = version_tuple_to_str(lilydirs.version_tuple()) os.environ["TEXINPUTS"] = os.environ["TEXINPUTS"] + ":%s/input/:" % depth; - os.environ["LILYINCLUDE"] = join (':', __main__.include_path) + os.environ["LILYINCLUDE"] = join (':', __main__.include_path) +':'+ os.environ["LILYINCLUDE"]; os.environ["LILYTOP"] = depth; __main__.mailaddress= os.environ['MAILADDRESS'] pw = pwd.getpwuid (os.getuid()); @@ -87,7 +87,7 @@ def my_system(cmds): ret = os.system (cmd) if ret: if ignoreret: - sys.stderr.write( "ignoring failed command \`%s\' (status %d)\n" % (cmd, ret)) + sys.stderr.write( "ignoring failed command `%s\' (status %d)\n" % (cmd, ret)) else: sys.stderr.write( 'make-website: failed on command %s (status %d)\n' % (cmd, ret)) sys.exit (2) @@ -116,7 +116,7 @@ mutopia_examples = [ "wtk1-fugue2", def gen_html(): print 'generating HTML' - my_system (["make -f OLD-Makefile -kC .. html"]); + my_system (["make -f Makefile -kC .. html"]); def gen_examples(inputs): @@ -224,7 +224,7 @@ def docxx_update(): banner= open('/tmp/lilybanner.html', 'w'); banner.write (footstr('../index.html')) banner.close () - my_system(['BANNEROPT=\"-B /tmp/lilybanner.html\" %s/bin/out/make-docxx' % depth]); + my_system(['BANNEROPT=\"-B /tmp/lilybanner.html\" %s/bin/make-docxx' % depth]); # os.unlink( "/tmp/lilybanner.html"); def get_glob(exts): @@ -249,7 +249,7 @@ def identify(): print 'This is %s\n' % id_str def clean_tmp(): - my_system(['rm -f /tmp/gs*']) + my_system(['-rm -f /tmp/gs*']) def get_top_of_NEWS(): i = open('NEWS.txt') @@ -288,7 +288,11 @@ def do_examples (examples, filename): def main(): identify(); - os.chdir (lilydirs.topdir + 'Documentation/out') + os.chdir (lilydirs.topdir + 'WWW') + + my_system (['-rm ../WWW/*.pod ../WWW/*.xpm ../WWW/*.doc', + 'ln ../Documentation/*.pod ../Documentation/*.doc ../Documentation/*.xpm .']); + os.chdir (lilydirs.topdir + 'WWW/out') __main__.depth = "../../"; __main__.include_path = map(lambda p: __main__.depth + '/' + p, __main__.include_path) diff --git a/bin/mf-deps.in b/bin/mf-deps.in old mode 100644 new mode 100755 index 6d022fff45..3483cfc9e9 --- a/bin/mf-deps.in +++ b/bin/mf-deps.in @@ -73,7 +73,8 @@ class Targetdeps: def target_string(self): # ugh. Closures, anyone? - targets = map (lambda x,y = self.basename: 'out/' + y + '.' + x, postfixes) +# targets = map (lambda x,y = self.basename: 'out/' + y + '.' + x, postfixes) + targets = map (lambda x,y = self.basename: y + '.' + x, postfixes) depstring = reduce(lambda x,y: x + ' ' + y, self.depfiles) dependencies = map (lambda x, y=depstring: x + ': ' + y, targets) diff --git a/bin/mf-to-table.in b/bin/mf-to-table.in old mode 100644 new mode 100755 diff --git a/bin/mudela-book.in b/bin/mudela-book.in old mode 100644 new mode 100755 diff --git a/bin/release.in b/bin/release.in old mode 100644 new mode 100755 diff --git a/bin/show-latest.in b/bin/show-latest.in old mode 100644 new mode 100755 diff --git a/bin/wild-perl b/bin/wild-perl old mode 100644 new mode 100755 index 83c2c82966..a26ceefcae --- a/bin/wild-perl +++ b/bin/wild-perl @@ -9,6 +9,8 @@ sub ignore_query return !grep(/$testfile/, @ignorestuff); } +print "# Generated automatically by wild-perl 0.1\n"; + while (<>) { $line = $_; if ($line =~ /^ *nowildcard: *(.*)$/) { @@ -32,3 +34,8 @@ while (<>) { print $line; } } + + +print "\$(srcdir)/Makefile.am: \$(srcdir)/Makefile.am.wild\n" . + "\t\$(PERL) \$(top_srcdir)/bin/wild-perl < \$< > \$@"; + diff --git a/config.guess b/config.guess new file mode 100755 index 0000000000..413ed41c0f --- /dev/null +++ b/config.guess @@ -0,0 +1,883 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Written by Per Bothner . +# The master version of this file is at the FSF in /home/gd/gnu/lib. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit system type (host/target name). +# +# Only a few systems have been added to this list; please add others +# (but try to keep the structure clean). +# + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 8/24/94.) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + cat <dummy.s + .globl main + .ent main +main: + .frame \$30,0,\$26,0 + .prologue 0 + .long 0x47e03d80 # implver $0 + lda \$2,259 + .long 0x47e20c21 # amask $2,$1 + srl \$1,8,\$2 + sll \$2,2,\$2 + sll \$0,3,\$0 + addl \$1,\$0,\$0 + addl \$2,\$0,\$0 + ret \$31,(\$26),1 + .end main +EOF + ${CC-cc} dummy.s -o dummy 2>/dev/null + if test "$?" = 0 ; then + ./dummy + case "$?" in + 7) + UNAME_MACHINE="alpha" + ;; + 15) + UNAME_MACHINE="alphaev5" + ;; + 14) + UNAME_MACHINE="alphaev56" + ;; + 10) + UNAME_MACHINE="alphapca56" + ;; + 16) + UNAME_MACHINE="alphaev6" + ;; + esac + fi + rm -f dummy.s dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + exit 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit 0 ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-cbm-sysv4 + exit 0;; + amiga:NetBSD:*:*) + echo m68k-cbm-netbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc64:OpenBSD:*:*) + echo mips64el-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hkmips:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; + arm32:NetBSD:*:*) + echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; + SR2?01:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit 0 ;; + NILE:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit 0 ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit 0 ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; + atari*:NetBSD:*:*) + echo m68k-atari-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3*:NetBSD:*:*) + echo m68k-sun-netbsd${UNAME_RELEASE} + exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:NetBSD:*:*) + echo m68k-apple-netbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + 2020:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + sed 's/^ //' << EOF >dummy.c + int main (argc, argv) int argc; char **argv; { + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + ${CC-cc} dummy.c -o dummy \ + && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit 0 ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit 0 ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit 0 ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit 0 ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ + -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else echo i586-dg-dgux${UNAME_RELEASE} + fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit 0 ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit 0 ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit 0 ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit 0 ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit 0 ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i?86:AIX:*:*) + echo i386-ibm-aix + exit 0 ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + sed 's/^ //' << EOF >dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + echo rs6000-ibm-aix3.2.5 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit 0 ;; + *:AIX:*:4) + if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=4.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit 0 ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit 0 ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit 0 ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit 0 ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit 0 ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit 0 ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit 0 ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit 0 ;; + 9000/[3478]??:HP-UX:*:*) + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; + 9000/8?? ) HP_ARCH=hppa1.0 ;; + esac + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; + 3050*:HI-UX:*:*) + sed 's/^ //' << EOF >dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + echo unknown-hitachi-hiuxwe2 + exit 0 ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit 0 ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit 0 ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit 0 ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit 0 ;; + i?86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit 0 ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit 0 ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit 0 ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit 0 ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} + exit 0 ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + exit 0 ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} + exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; + F300:UNIX_System_V:*:*) + FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + F301:UNIX_System_V:*:*) + echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` + exit 0 ;; + hp3[0-9][05]:NetBSD:*:*) + echo m68k-hp-netbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + i?86:BSD/386:*:* | *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; + *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:NetBSD:*:*) + echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; + i*:CYGWIN*:*) + echo i386-pc-cygwin32 + exit 0 ;; + i*:MINGW*:*) + echo i386-pc-mingw32 + exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin32 + exit 0 ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; + *:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. + ld_help_string=`ld --help 2>&1` + ld_supported_emulations=`echo $ld_help_string \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` + case "$ld_supported_emulations" in + i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; + i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; + sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + esac + + if test "${UNAME_MACHINE}" = "alpha" ; then + sed 's/^ //' <dummy.s + .globl main + .ent main + main: + .frame \$30,0,\$26,0 + .prologue 0 + .long 0x47e03d80 # implver $0 + lda \$2,259 + .long 0x47e20c21 # amask $2,$1 + srl \$1,8,\$2 + sll \$2,2,\$2 + sll \$0,3,\$0 + addl \$1,\$0,\$0 + addl \$2,\$0,\$0 + ret \$31,(\$26),1 + .end main +EOF + LIBC="" + ${CC-cc} dummy.s -o dummy 2>/dev/null + if test "$?" = 0 ; then + ./dummy + case "$?" in + 7) + UNAME_MACHINE="alpha" + ;; + 15) + UNAME_MACHINE="alphaev5" + ;; + 14) + UNAME_MACHINE="alphaev56" + ;; + 10) + UNAME_MACHINE="alphapca56" + ;; + 16) + UNAME_MACHINE="alphaev6" + ;; + esac + + objdump --private-headers dummy | \ + grep ld.so.1 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f dummy.s dummy + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 + elif test "${UNAME_MACHINE}" = "mips" ; then + cat >dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + else + # Either a pre-BFD a.out linker (linux-gnuoldld) + # or one that does not give us useful --help. + # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. + # If ld does not provide *any* "supported emulations:" + # that means it is gnuoldld. + echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" + test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + + case "${UNAME_MACHINE}" in + i?86) + VENDOR=pc; + ;; + *) + VENDOR=unknown; + ;; + esac + # Determine whether the default compiler is a.out or elf + cat >dummy.c < +main(argc, argv) + int argc; + char *argv[]; +{ +#ifdef __ELF__ +# ifdef __GLIBC__ +# if __GLIBC__ >= 2 + printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); +# else + printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +# endif +# else + printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +# endif +#else + printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); +#endif + return 0; +} +EOF + ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + fi ;; +# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions +# are messed up and put the nodename in both sysname and nodename. + i?86:DYNIX/ptx:4*:*) + echo i386-sequent-sysv4 + exit 0 ;; + i?86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; + i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + fi + exit 0 ;; + i?86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit 0 ;; + pc:*:*:*) + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit 0 ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit 0 ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit 0 ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit 0 ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; + m68*:LynxOS:2.*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit 0 ;; + i?86:LynxOS:2.*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit 0 ;; + PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; + news*:NEWS-OS:*:6*) + echo mips-sony-newsos6 + exit 0 ;; + R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit 0 ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +cat >dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +#if !defined (ultrix) + printf ("vax-dec-bsd\n"); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 +rm -f dummy.c dummy + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit 0 ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + c34*) + echo c34-convex-bsd + exit 0 ;; + c38*) + echo c38-convex-bsd + exit 0 ;; + c4*) + echo c4-convex-bsd + exit 0 ;; + esac +fi + +#echo '(Unable to guess system type)' 1>&2 + +exit 1 diff --git a/config.sub b/config.sub new file mode 100755 index 0000000000..213a6d47d6 --- /dev/null +++ b/config.sub @@ -0,0 +1,954 @@ +#! /bin/sh +# Configuration validation subroutine script, version 1.1. +# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +if [ x$1 = x ] +then + echo Configuration name missing. 1>&2 + echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 + echo "or $0 ALIAS" 1>&2 + echo where ALIAS is a recognized configuration type. 1>&2 + exit 1 +fi + +# First pass through any local machine types. +case $1 in + *local*) + echo $1 + exit 0 + ;; + *) + ;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + linux-gnu*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple) + os= + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco5) + os=sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + | arme[lb] | pyramid | mn10200 | mn10300 \ + | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ + | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ + | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ + | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ + | mipstx39 | mipstx39el \ + | sparc | sparclet | sparclite | sparc64 | v850) + basic_machine=$basic_machine-unknown + ;; + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i[3456]86) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ + | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ + | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \ + | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ + | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ + | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparc64-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mipstx39-* | mipstx39el-* \ + | f301-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-cbm + ;; + amigaos | amigados) + basic_machine=m68k-cbm + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-cbm + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | ymp) + basic_machine=ymp-cray + os=-unicos + ;; + cray2) + basic_machine=cray2-cray + os=-unicos + ;; + [ctj]90-cray) + basic_machine=c90-cray + os=-unicos + ;; + crds | unos) + basic_machine=m68k-crds + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + os=-mvs + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i[3456]86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i[3456]86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i[3456]86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i[3456]86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + miniframe) + basic_machine=m68000-convergent + ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + np1) + basic_machine=np1-gould + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pentium | p5) + basic_machine=i586-intel + ;; + pentiumpro | p6) + basic_machine=i686-intel + ;; + pentium-* | p5-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + k5) + # We don't have specific support for AMD's K5 yet, so just call it a Pentium + basic_machine=i586-amd + ;; + nexen) + # We don't have specific support for Nexgen yet, so just call it a Pentium + basic_machine=i586-nexgen + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=rs6000-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + xmp) + basic_machine=xmp-cray + os=-unicos + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; + romp) + basic_machine=romp-ibm + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sparc) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -ctix* | -uts*) + os=-sysv + ;; + -ns2 ) + os=-nextstep2 + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -xenix) + os=-xenix + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + *-acorn) + os=-riscix1.2 + ;; + arm*-semi) + os=-aout + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-ibm) + os=-aix + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f301-fujitsu) + os=-uxpv + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -hpux*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -vxsim* | -vxworks*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os diff --git a/configure b/configure index 30e3032d68..6ee28b6287 100755 --- a/configure +++ b/configure @@ -11,6 +11,16 @@ 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 @@ -537,7 +547,7 @@ fi -. ./VERSION +. $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 @@ -572,7 +582,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # 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 +echo "configure:586: 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 @@ -624,24 +634,8 @@ 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 <> confdefs.h <&6 -echo "configure:645: checking whether build environment is sane" >&5 +echo "configure:639: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -652,10 +646,21 @@ 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 @@ -686,9 +691,54 @@ 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 <> confdefs.h <&6 -echo "configure:692: checking for working aclocal" >&5 +echo "configure:742: 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. @@ -701,7 +751,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:705: checking for working autoconf" >&5 +echo "configure:755: 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. @@ -714,7 +764,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:718: checking for working automake" >&5 +echo "configure:768: 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. @@ -727,7 +777,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:731: checking for working autoheader" >&5 +echo "configure:781: 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. @@ -740,7 +790,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:744: checking for working makeinfo" >&5 +echo "configure:794: 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. @@ -752,38 +802,12 @@ else echo "$ac_t""missing" 1>&6 fi -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:757: 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 # 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:787: checking for $ac_word" >&5 +echo "configure:811: 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 @@ -812,7 +836,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:816: checking for $ac_word" >&5 +echo "configure:840: 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 @@ -860,7 +884,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:864: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:888: 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. @@ -870,11 +894,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:902: \"$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 @@ -894,12 +918,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:898: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:922: 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:903: checking whether we are using GNU C" >&5 +echo "configure:927: 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 @@ -908,7 +932,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:936: \"$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 @@ -923,7 +947,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:927: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:951: 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 @@ -955,7 +979,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:959: checking for $ac_word" >&5 +echo "configure:983: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -986,7 +1010,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:990: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1014: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -996,11 +1020,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1028: \"$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 @@ -1026,12 +1050,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:1030: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1054: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1035: checking whether we are using GNU C++" >&5 +echo "configure:1059: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1040,7 +1064,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1044: \"$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:1068: \"$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 @@ -1055,7 +1079,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:1059: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1083: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1082,10 +1106,85 @@ else test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" fi + +# turn off shared libraries by default (may be enabled using --enable-shared) +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + p=${PACKAGE-default} +case "$enableval" in +yes) enable_shared=yes ;; +no) enable_shared=no ;; +*) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_shared=no +fi + +# Check whether --enable-static or --disable-static was given. +if test "${enable_static+set}" = set; then + enableval="$enable_static" + p=${PACKAGE-default} +case "$enableval" in +yes) enable_static=yes ;; +no) enable_static=no ;; +*) + enable_static=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_static=yes +fi + + +# Make sure we can run config.sub. +if $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:1165: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`$ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1089: checking for $ac_word" >&5 +echo "configure:1188: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1111,6 +1210,195 @@ 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:1227: 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:1245: checking for GNU ld" >&5 +else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +echo "configure:1248: checking for non-GNU ld" >&5 +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:1284: 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 &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:1300: 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:1337: 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 1373 "configure"' > conftest.$ac_ext + if { (eval echo configure:1374: \"$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; } + # ugh, automake: we want (and check for) bison for ac_prog in 'bison -y' byacc @@ -1118,7 +1406,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:1122: checking for $ac_word" >&5 +echo "configure:1410: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1152,7 +1440,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1156: checking for $ac_word" >&5 +echo "configure:1444: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1185,7 +1473,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1189: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1477: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1193,7 +1481,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1228,7 +1516,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1232: checking how to run the C preprocessor" >&5 +echo "configure:1520: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1243,13 +1531,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1260,13 +1548,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1289,7 +1577,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1293: checking lex output file root" >&5 +echo "configure:1581: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1310,7 +1598,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:1314: checking whether yytext is a pointer" >&5 +echo "configure:1602: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1322,14 +1610,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -1356,7 +1644,7 @@ ac_cv_prog_lex_root=lex.yy missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1360: checking for working aclocal" >&5 +echo "configure:1648: 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. @@ -1369,7 +1657,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1373: checking for working autoconf" >&5 +echo "configure:1661: 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. @@ -1382,7 +1670,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1386: checking for working automake" >&5 +echo "configure:1674: 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. @@ -1395,7 +1683,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1399: checking for working autoheader" >&5 +echo "configure:1687: 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. @@ -1408,7 +1696,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1412: checking for working makeinfo" >&5 +echo "configure:1700: 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. @@ -1421,15 +1709,6 @@ else fi -if test x$srcdir != x.; then - echo Please look in the INSTALL instructions for - echo directions for multi-architecture building - - - echo "configure: warning: This package does not support --srcdir!" 1>&2 - warn_b=yes - -fi printing_b=no checking_b=yes @@ -1560,7 +1839,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1564: checking for $ac_word" >&5 +echo "configure:1843: 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 @@ -1591,7 +1870,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1595: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1874: 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. @@ -1601,11 +1880,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1888: \"$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 @@ -1625,12 +1904,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:1629: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1908: 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:1634: checking whether we are using GNU C++" >&5 +echo "configure:1913: 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 @@ -1639,7 +1918,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1643: \"$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:1922: \"$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 @@ -1654,7 +1933,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:1658: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1937: 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 @@ -1681,35 +1960,7 @@ else test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" fi -# 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:1688: 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 - +# AC_PROG_RANLIB # 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: @@ -1721,7 +1972,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:1725: checking for a BSD compatible install" >&5 +echo "configure:1976: 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 @@ -1775,7 +2026,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:1779: checking for $ac_word" >&5 +echo "configure:2030: 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 @@ -1809,7 +2060,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:1813: checking for $ac_word" >&5 +echo "configure:2064: 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 @@ -1875,7 +2126,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1879: checking for $ac_word" >&5 +echo "configure:2130: 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 @@ -1909,7 +2160,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1913: checking for $ac_word" >&5 +echo "configure:2164: 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 @@ -1943,7 +2194,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:1947: checking for $ac_word" >&5 +echo "configure:2198: 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 @@ -1975,7 +2226,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:1979: checking for $ac_word" >&5 +echo "configure:2230: 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 @@ -2007,7 +2258,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:2011: checking for $ac_word" >&5 +echo "configure:2262: 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 @@ -2041,7 +2292,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:2045: checking for $ac_word" >&5 +echo "configure:2296: 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 @@ -2075,7 +2326,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:2079: checking for $ac_word" >&5 +echo "configure:2330: 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 @@ -2111,7 +2362,7 @@ if test "x$TEXPREFIX" = xauto ; then echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:2115: checking TeX/MF root dir directory" >&5 +echo "configure:2366: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -2137,7 +2388,7 @@ echo "configure:2115: checking TeX/MF root dir directory" >&5 find_texprefix="$find_root_prefix/$find_texpostfix" # only assign if variablename not empty - if test x != "xTEXPREFIX"; then + if test x != "x$TEXPREFIX"; then TEXPREFIX='${prefix}'/"$find_texpostfix" fi echo "$ac_t""$find_texprefix" 1>&6 @@ -2156,7 +2407,7 @@ if test "x$TEXDIR" = xauto ; then echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:2160: checking TeX input directory" >&5 +echo "configure:2411: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -2219,19 +2470,19 @@ fi fi - if test $PODMAN = "error" + if test $FLEX = "error" then - echo "configure: warning: can't find pod. You should install Perl" 1>&2 + echo "configure: warning: can't find flex. Please install Flex" 1>&2 warn_b=yes fi - if test $FLEX = "error" + if test $POD2MAN = "error" then - echo "configure: warning: can't find flex. Please install Flex" 1>&2 + echo "configure: warning: can't find pod. You should install Perl" 1>&2 warn_b=yes fi @@ -2272,7 +2523,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2276: checking how to run the C++ preprocessor" >&5 +echo "configure:2527: 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 @@ -2285,12 +2536,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2310,17 +2561,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:2314: checking for FlexLexer.h" >&5 +echo "configure:2565: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2359,7 +2610,8 @@ touch lib/stamp-h.in echo \#define TOPLEVEL_VERSION \"$FULL_VERSION\" >> lib/config.hh - + +# first do Foobar/Makefile then Foobar/include/Makefile trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2461,7 +2713,16 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "bin/Makefile lib/include/Makefile lib/Makefile lily/include/Makefile lily/Makefile mf/Makefile mi2mu/include/Makefile mi2mu/Makefile debian/Makefile Documentation/Makefile init/Makefile input/Makefile tex/Makefile make/Makefile mutopia/J.S.Bach/Makefile mutopia/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:lib/config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "bin/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:lib/config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 29892e1fc5..34ca2af321 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(flower/choleski.cc) -. ./VERSION +. $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 @@ -12,7 +12,10 @@ AM_INIT_AUTOMAKE(lilypond, $FULL_VERSION) AC_PROG_CC AC_PROG_CXX -AC_PROG_RANLIB + +# turn off shared libraries by default (may be enabled using --enable-shared) +AM_DISABLE_SHARED +AM_PROG_LIBTOOL # ugh, automake: we want (and check for) bison AC_PROG_YACC @@ -32,12 +35,6 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -if test x$srcdir != x.; then - echo Please look in the INSTALL instructions for - echo directions for multi-architecture building - - AC_LILY_WARN(This package does not support --srcdir!) -fi printing_b=no checking_b=yes @@ -128,7 +125,7 @@ CPPFLAGS=${CPPFLAGS:-""} # we don't want -g -O junk CXXFLAGS=${CXXFLAGS:-""} # we don't want -g -O junk AC_PROG_CXX -AC_PROG_RANLIB +# AC_PROG_RANLIB AC_PROG_INSTALL AC_CHECK_PROGS(TAR, tar, error) AC_CHECK_PROGS(FIND, find, error) @@ -190,8 +187,8 @@ AC_CHECK_SEARCH_RESULT($MAKE, GNU make, You should install GNU make) AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or better) AC_CHECK_SEARCH_RESULT($PERL, perl, You should install Perl, version 5 or better) AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) -AC_CHECK_SEARCH_RESULT($PODMAN, pod, You should install Perl, version 5 or better) -AC_CHECK_SEARCH_RESULT( $FLEX, flex, Please install Flex, 2.5 or better) +AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or better) +AC_CHECK_SEARCH_RESULT($POD2MAN, pod, You should install Perl, version 5 or better) if test $MAKE != "error" ; then @@ -230,8 +227,18 @@ AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") touch lib/stamp-h.in AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in) echo \#define TOPLEVEL_VERSION \"$FULL_VERSION\" >> lib/config.hh - -AC_OUTPUT(bin/Makefile lib/include/Makefile lib/Makefile lily/include/Makefile lily/Makefile mf/Makefile mi2mu/include/Makefile mi2mu/Makefile debian/Makefile Documentation/Makefile init/Makefile input/Makefile tex/Makefile make/Makefile mutopia/J.S.Bach/Makefile mutopia/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) + +# 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 + 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) # 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 diff --git a/debian/Makefile.am b/debian/Makefile.am index 4b1cae3bbc..214e6f4638 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1,7 +1,7 @@ -# Automatically generated from ./lilypond-0.1.49/debian/Makefile.am.wild by bin/autowild -# Do not edit -# debian/Makefile.am.wild +# Generated automatically by wild-perl 0.1# debian/Makefile.am.wild EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \ postinst postinst.old.sh postrm preinst rules watch +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/debian/Makefile.in b/debian/Makefile.in index 22e578be0e..42ec05cfb8 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./debian/Makefile.am.wild by bin/autowild -# Do not edit -# debian/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# debian/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -145,25 +155,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -175,6 +186,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/flower/Makefile.am b/flower/Makefile.am index e0446e0081..c91e9337ab 100644 --- a/flower/Makefile.am +++ b/flower/Makefile.am @@ -1,5 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/flower/Makefile.am.wild by bin/autowild -# Do not edit +# Generated automatically by wild-perl 0.1 # project FlowerSoft C++ library # title top level makefile for FlowerLib # file flower/Makefile.am.wild @@ -11,13 +10,16 @@ SUBDIRS = include test -lib_LIBRARIES = libflower.a -# lib_LIBRARIES = libflower.la +lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) -libflower_a_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc +libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc -INCLUDES = -Iinclude +libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ +INCLUDES = -I$(srcdir)/include + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(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 f19c6ab501..8a4af49009 100644 --- a/flower/Makefile.am.wild +++ b/flower/Makefile.am.wild @@ -9,13 +9,14 @@ SUBDIRS = include test -lib_LIBRARIES = libflower.a -# lib_LIBRARIES = libflower.la +lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) -libflower_a_SOURCES = $(wildcard *.cc) +libflower_la_SOURCES = $(wildcard *.cc) -INCLUDES = -Iinclude +libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + +INCLUDES = -I$(srcdir)/include diff --git a/flower/Makefile.in b/flower/Makefile.in index 4d725bd520..d3d3612e89 100644 --- a/flower/Makefile.in +++ b/flower/Makefile.in @@ -1,11 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./flower/Makefile.am.wild by bin/autowild -# Do not edit +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 # project FlowerSoft C++ library # title top level makefile for FlowerLib # file flower/Makefile.am.wild @@ -54,55 +59,67 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AGE = @AGE@ CC = @CC@ +CURRENT = @CURRENT@ CXX = @CXX@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ LIB_SUFFIX = @LIB_SUFFIX@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MODULE_CXXFLAGS = @MODULE_CXXFLAGS@ MODULE_LDFLAGS = @MODULE_LDFLAGS@ +NM = @NM@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ +REVISION = @REVISION@ VERSION = @VERSION@ SUBDIRS = include test -lib_LIBRARIES = libflower.a -# lib_LIBRARIES = libflower.la +lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) -libflower_a_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc +libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc + +libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ -INCLUDES = -Iinclude +INCLUDES = -I$(srcdir)/include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.hh CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libflower_a_LIBADD = -libflower_a_OBJECTS = choleski.o cpu-timer.o data-file.o \ -diagonal-storage.o dictionary.o directed-graph.o dstream.o \ -flower-debug.o flower-version.o full-storage.o interval.o lgetopt.o \ -libc-extension.o matrix-debug.o matrix-storage.o matrix.o nscalar.o \ -path.o rational.o scalar.o string-convert.o string.o stringutil.o \ -text-db.o text-stream.o unionfind.o vector.o -AR = ar +libflower_la_LIBADD = +libflower_la_OBJECTS = choleski.lo cpu-timer.lo data-file.lo \ +diagonal-storage.lo dictionary.lo directed-graph.lo dstream.lo \ +flower-debug.lo flower-version.lo full-storage.lo interval.lo \ +lgetopt.lo libc-extension.lo matrix-debug.lo matrix-storage.lo \ +matrix.lo nscalar.lo path.lo rational.lo scalar.lo string-convert.lo \ +string.lo stringutil.lo text-db.lo text-stream.lo unionfind.lo \ +vector.lo CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS TODO aclocal.m4 config.hh.in configure configure.in \ missing mkinstalldirs stamp-h.in @@ -112,26 +129,17 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -DEP_FILES = .deps/choleski.P .deps/cpu-timer.P .deps/data-file.P \ -.deps/diagonal-storage.P .deps/dictionary.P .deps/directed-graph.P \ -.deps/dstream.P .deps/flower-debug.P .deps/flower-version.P \ -.deps/full-storage.P .deps/interval.P .deps/lgetopt.P \ -.deps/libc-extension.P .deps/matrix-debug.P .deps/matrix-storage.P \ -.deps/matrix.P .deps/nscalar.P .deps/path.P .deps/rational.P \ -.deps/scalar.P .deps/string-convert.P .deps/string.P .deps/stringutil.P \ -.deps/text-db.P .deps/text-stream.P .deps/unionfind.P .deps/vector.P -CXXMKDEP = $(CXX) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -SOURCES = $(libflower_a_SOURCES) -OBJECTS = $(libflower_a_OBJECTS) +SOURCES = $(libflower_la_SOURCES) +OBJECTS = $(libflower_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -144,6 +152,7 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCI cd $(srcdir) && $(AUTOCONF) config.hh: stamp-h + @: stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.hh:config.hh.in \ @@ -159,61 +168,79 @@ mostlyclean-hdr: clean-hdr: distclean-hdr: - rm -f config.hh + -rm -f config.hh maintainer-clean-hdr: -mostlyclean-libLIBRARIES: +mostlyclean-libLTLIBRARIES: -clean-libLIBRARIES: - test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -distclean-libLIBRARIES: +distclean-libLTLIBRARIES: -maintainer-clean-libLIBRARIES: +maintainer-clean-libLTLIBRARIES: -install-libLIBRARIES: $(lib_LIBRARIES) +install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(libdir) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \ - $(INSTALL_DATA) $$p $(libdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(RANLIB) $(libdir)/$$p"; \ - $(RANLIB) $(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \ else :; fi; \ done -uninstall-libLIBRARIES: - $(NORMAL_UNINSTALL) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - rm -f $(libdir)/$$p; \ +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$$p; \ done .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: -libflower.a: $(libflower_a_OBJECTS) $(libflower_a_DEPENDENCIES) - rm -f libflower.a - $(AR) cru libflower.a $(libflower_a_OBJECTS) $(libflower_a_LIBADD) - $(RANLIB) libflower.a +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +libflower.la: $(libflower_la_OBJECTS) $(libflower_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libflower_la_LDFLAGS) $(libflower_la_OBJECTS) $(libflower_la_LIBADD) $(LIBS) .cc.o: $(CXXCOMPILE) -c $< +.cc.lo: + $(LTCXXCOMPILE) -c $< # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -228,7 +255,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -238,7 +265,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -252,24 +281,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -280,7 +314,7 @@ top_distdir = $(distdir) # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - rm -rf $(distdir) + -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -293,73 +327,141 @@ distcheck: dist && $(MAKE) install \ && $(MAKE) installcheck \ && $(MAKE) dist - rm -rf $(distdir) + -rm -rf $(distdir) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" dist: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) distdir: $(DISTFILES) - rm -rf $(distdir) + -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +choleski.lo choleski.o: choleski.cc include/choleski.hh \ + include/matrix.hh include/matrix-storage.hh include/varray.hh \ + include/real.hh include/virtual-methods.hh include/vector.hh +cpu-timer.lo cpu-timer.o: cpu-timer.cc include/cpu-timer.hh \ + include/real.hh +data-file.lo data-file.o: data-file.cc include/international.hh \ + include/data-file.hh include/text-stream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh include/compare.hh \ + include/varray.hh +diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \ + include/diagonal-storage.hh include/full-storage.hh \ + include/varray.hh include/matrix-storage.hh include/real.hh \ + include/virtual-methods.hh include/full-storage.icc +dictionary.lo dictionary.o: dictionary.cc +directed-graph.lo directed-graph.o: directed-graph.cc \ + include/directed-graph.hh include/parray.hh include/varray.hh +dstream.lo dstream.o: dstream.cc include/assoc.hh include/varray.hh \ + include/dstream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/scalar.hh \ + include/text-db.hh include/data-file.hh include/text-stream.hh \ + include/string-convert.hh include/assoc-iter.hh +flower-debug.lo flower-debug.o: flower-debug.cc include/flower-debug.hh \ + include/dstream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh +flower-version.lo flower-version.o: flower-version.cc config.hh +full-storage.lo full-storage.o: full-storage.cc include/full-storage.hh \ + include/varray.hh include/matrix-storage.hh include/real.hh \ + include/virtual-methods.hh include/full-storage.icc +interval.lo interval.o: interval.cc include/interval.hh \ + include/fproto.hh include/real.hh include/compare.hh \ + include/interval.tcc include/string.hh \ + include/arithmetic-operator.hh include/string-handle.hh \ + include/international.hh include/flower-debug.hh \ + include/dstream.hh +lgetopt.lo lgetopt.o: lgetopt.cc include/lgetopt.hh \ + include/international.hh +libc-extension.lo libc-extension.o: libc-extension.cc \ + include/libc-extension.hh include/fproto.hh include/real.hh \ + config.hh +matrix-debug.lo matrix-debug.o: matrix-debug.cc include/flower-debug.hh \ + include/dstream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/matrix.hh \ + include/matrix-storage.hh include/varray.hh \ + include/virtual-methods.hh include/vector.hh +matrix-storage.lo matrix-storage.o: matrix-storage.cc \ + include/full-storage.hh include/varray.hh \ + include/matrix-storage.hh include/real.hh \ + include/virtual-methods.hh include/diagonal-storage.hh +matrix.lo matrix.o: matrix.cc include/matrix.hh \ + include/matrix-storage.hh include/varray.hh include/real.hh \ + include/virtual-methods.hh include/vector.hh \ + include/full-storage.hh include/diagonal-storage.hh +nscalar.lo nscalar.o: nscalar.cc +path.lo path.o: path.cc include/path.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/varray.hh \ + include/flower-debug.hh include/dstream.hh +rational.lo rational.o: rational.cc include/rational.hh \ + include/compare.hh include/arithmetic-operator.hh \ + include/fproto.hh include/real.hh include/string.hh \ + include/string-handle.hh include/international.hh \ + include/string-convert.hh include/libc-extension.hh config.hh +scalar.lo scalar.o: scalar.cc include/scalar.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/rational.hh +string-convert.lo string-convert.o: string-convert.cc \ + include/libc-extension.hh include/fproto.hh include/real.hh \ + config.hh include/string.hh include/arithmetic-operator.hh \ + include/string-handle.hh include/international.hh \ + include/compare.hh include/string-convert.hh \ + include/rational.hh +string.lo string.o: string.cc include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh \ + include/libc-extension.hh config.hh include/string-convert.hh +stringutil.lo stringutil.o: stringutil.cc include/string-handle.hh \ + include/fproto.hh include/real.hh include/string-data.hh \ + include/string.hh include/arithmetic-operator.hh \ + include/international.hh include/compare.hh \ + include/string-data.icc include/string-handle.icc \ + include/string.icc +text-db.lo text-db.o: text-db.cc include/text-db.hh include/data-file.hh \ + include/text-stream.hh include/string.hh \ + include/arithmetic-operator.hh include/fproto.hh \ + include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/varray.hh +text-stream.lo text-stream.o: text-stream.cc include/text-stream.hh \ + include/string.hh include/arithmetic-operator.hh \ + include/fproto.hh include/real.hh include/string-handle.hh \ + include/international.hh include/compare.hh include/varray.hh +unionfind.lo unionfind.o: unionfind.cc include/unionfind.hh \ + include/varray.hh +vector.lo vector.o: vector.cc include/vector.hh include/real.hh \ + include/varray.hh -MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) --include .deps/.P -.deps/.P: $(BUILT_SOURCES) - echo > $@ - --include $(DEP_FILES) - -mostlyclean-depend: - -clean-depend: - -distclean-depend: - -maintainer-clean-depend: - rm -rf .deps - -.deps/%.P: %.c - @echo "Computing dependencies for $<..." - @o='o'; \ - test -n "$o" && o='$$o'; \ - $(MKDEP) $< >$@.tmp \ - && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ - && rm -f $@.tmp - -.deps/%.P: %.cc - @echo "Computing dependencies for $<..." - @o='o'; \ - $(CXXMKDEP) $< >$@.tmp \ - && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ - && rm -f $@.tmp info: info-recursive dvi: dvi-recursive check: all-am @@ -368,11 +470,11 @@ installcheck: installcheck-recursive all-recursive-am: config.hh $(MAKE) all-recursive -all-am: Makefile $(LIBRARIES) config.hh +all-am: Makefile $(LTLIBRARIES) config.hh -install-exec-am: install-libLIBRARIES +install-exec-am: install-libLTLIBRARIES -uninstall-am: uninstall-libLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES install-exec: install-exec-recursive install-exec-am @$(NORMAL_INSTALL) @@ -394,33 +496,34 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-hdr mostlyclean-libLIBRARIES \ - mostlyclean-compile mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-tags mostlyclean-generic -clean-am: clean-hdr clean-libLIBRARIES clean-compile clean-tags \ - clean-depend clean-generic mostlyclean-am +clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am -distclean-am: distclean-hdr distclean-libLIBRARIES distclean-compile \ - distclean-tags distclean-depend distclean-generic \ +distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-tags distclean-generic \ clean-am -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-generic \ distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am @@ -428,31 +531,35 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status + -rm -f config.status .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ -maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \ -clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ -install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ +maintainer-clean-hdr mostlyclean-libLTLIBRARIES \ +distclean-libLTLIBRARIES clean-libLTLIBRARIES \ +maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \ +install-libLTLIBRARIES mostlyclean-compile distclean-compile \ +clean-compile maintainer-clean-compile mostlyclean-libtool \ +distclean-libtool clean-libtool maintainer-clean-libtool \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir \ -mostlyclean-depend distclean-depend clean-depend \ -maintainer-clean-depend info dvi installcheck all-recursive-am all-am \ -install-exec-am uninstall-am install-exec install-data install \ -uninstall all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ +installcheck all-recursive-am all-am install-exec-am uninstall-am \ +install-exec install-data install uninstall all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/flower/aclocal.m4 b/flower/aclocal.m4 index 6984d2990f..bcae532fab 100644 --- a/flower/aclocal.m4 +++ b/flower/aclocal.m4 @@ -1,4 +1,14 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2 +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. @@ -22,8 +32,8 @@ fi ifelse([$3],, AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) -AM_SANITY_CHECK -AC_ARG_PROGRAM +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) @@ -31,7 +41,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_PROG_MAKE_SET]) +AC_REQUIRE([AC_PROG_MAKE_SET])]) # serial 1 @@ -58,10 +68,21 @@ 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 @@ -90,6 +111,244 @@ else 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 &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, diff --git a/flower/configure b/flower/configure index 405582ccbf..c0a704a5d7 100755 --- a/flower/configure +++ b/flower/configure @@ -12,9 +12,15 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - enable-shared shared flower library" + --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 - disable-optimise optimisations off" + --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]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -523,7 +529,7 @@ fi -. ./VERSION +. $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 @@ -558,7 +564,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # 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:562: checking for a BSD compatible install" >&5 +echo "configure:568: 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 @@ -610,24 +616,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -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 <> confdefs.h <&6 -echo "configure:631: checking whether build environment is sane" >&5 +echo "configure:621: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -638,10 +628,21 @@ 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 @@ -672,9 +673,54 @@ 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:678: 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 <> confdefs.h <&6 -echo "configure:678: checking for working aclocal" >&5 +echo "configure:724: 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. @@ -687,7 +733,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:691: checking for working autoconf" >&5 +echo "configure:737: 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. @@ -700,7 +746,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:704: checking for working automake" >&5 +echo "configure:750: 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. @@ -713,7 +759,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:717: checking for working autoheader" >&5 +echo "configure:763: 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. @@ -726,7 +772,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:730: checking for working makeinfo" >&5 +echo "configure:776: 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. @@ -738,209 +784,12 @@ else echo "$ac_t""missing" 1>&6 fi -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:743: 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 - - -# 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:773: 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:802: 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:850: 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 <&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:884: 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:889: 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 <&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:913: 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 # 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:944: checking for $ac_word" >&5 +echo "configure:793: 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 @@ -969,7 +818,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:973: checking for $ac_word" >&5 +echo "configure:822: 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 @@ -1017,7 +866,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1021: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:870: 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. @@ -1027,11 +876,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:884: \"$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 @@ -1051,12 +900,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1055: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:904: 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:1060: checking whether we are using GNU C" >&5 +echo "configure:909: 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 @@ -1065,7 +914,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:918: \"$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 @@ -1080,7 +929,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1084: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:933: 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 @@ -1112,7 +961,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:1116: checking for $ac_word" >&5 +echo "configure:965: 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 @@ -1143,7 +992,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1147: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:996: 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. @@ -1153,11 +1002,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1010: \"$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 @@ -1183,12 +1032,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:1187: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1036: 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:1192: checking whether we are using GNU C++" >&5 +echo "configure:1041: 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 @@ -1197,7 +1046,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1201: \"$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:1050: \"$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 @@ -1212,7 +1061,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:1216: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1065: 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 @@ -1239,10 +1088,85 @@ else 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:1147: 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:1246: checking for $ac_word" >&5 +echo "configure:1170: 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 @@ -1268,11 +1192,201 @@ 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:1209: 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:1227: checking for GNU ld" >&5 +else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +echo "configure:1230: 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:1266: 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 &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:1282: 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:1319: 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 1355 "configure"' > conftest.$ac_ext + if { (eval echo configure:1356: \"$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; } + + missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1276: checking for working aclocal" >&5 +echo "configure:1390: 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. @@ -1285,7 +1399,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1289: checking for working autoconf" >&5 +echo "configure:1403: 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. @@ -1298,7 +1412,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1302: checking for working automake" >&5 +echo "configure:1416: 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. @@ -1311,7 +1425,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1315: checking for working autoheader" >&5 +echo "configure:1429: 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. @@ -1324,86 +1438,40 @@ else fi # AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) - -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 - - -optimise_b=yes -shared_b=no -LIB_SUFFIX=.a -MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT" - -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - shared_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 - - -if test $shared_b = yes; then - MODULE_CXXFLAGS="$MODULE_CXXFLAGS -fPIC -DPIC" - MODULE_LDFLAGS="-shared -Wl,-soname,libflower.so.\$(VERSION) " - LIB_SUFFIX=.so -fi - -if test $optimise_b = yes; then - MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED" -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 +# 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:1375: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then +echo "configure:1445: 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 - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -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_prog_CXX="$ac_prog" + 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 -fi -CXX="$ac_cv_prog_CXX" -if test -n "$CXX"; then - echo "$ac_t""$CXX" 1>&6 +PERL="$ac_cv_path_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 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:1406: 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' @@ -1411,89 +1479,43 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cxx_cross=no - else - ac_cv_prog_cxx_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cxx_works=no -fi -rm -fr conftest* -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:1440: 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 +# optimise_b=yes +# shared_b=no +LIB_SUFFIX=.a +MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT" -echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1445: checking whether we are using GNU C++" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes -else - ac_cv_prog_gxx=no -fi +if test $optimise_b = yes; then + MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED" 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:1469: 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 + +# 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 + + + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:1497: checking for 8-bit clean memcmp" >&5 +echo "configure:1519: 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 @@ -1501,7 +1523,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1540: \"$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 @@ -1532,12 +1554,12 @@ 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:1536: checking for vprintf" >&5 +echo "configure:1558: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1587,12 +1609,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1591: checking for _doprnt" >&5 +echo "configure:1613: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1645,12 +1667,12 @@ fi for ac_func in memmem snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1649: checking for $ac_func" >&5 +echo "configure:1671: 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 <&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1854,10 +1876,23 @@ 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%@PERL@%$PERL%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%@LIBOBJS@%$LIBOBJS%g CEOF diff --git a/flower/configure.in b/flower/configure.in index 4c28402072..6680ebd9f0 100644 --- a/flower/configure.in +++ b/flower/configure.in @@ -3,18 +3,20 @@ dnl Process this file with autoconf to produce a configure script.- AC_INIT(choleski.cc) -. ./VERSION +. $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_CC AC_PROG_CXX -AC_PROG_RANLIB + +# turn off shared libraries by default (may be enabled using --enable-shared) +AM_DISABLE_SHARED +AM_PROG_LIBTOOL + missing_dir=`cd $ac_aux_dir && pwd` @@ -23,28 +25,16 @@ 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_PATH_PROG(PERL, perl, error) + AC_LANG_CPLUSPLUS -optimise_b=yes -shared_b=no +# optimise_b=yes +# shared_b=no LIB_SUFFIX=.a MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT" -AC_ARG_ENABLE(shared, - [ enable-shared shared flower library], - [shared_b=$enableval]) - -AC_ARG_ENABLE(optimise, - [ disable-optimise optimisations off], - [optimise_b=$enableval]) - -if test $shared_b = yes; then - MODULE_CXXFLAGS="$MODULE_CXXFLAGS -fPIC -DPIC" - MODULE_LDFLAGS="-shared -Wl,-soname,libflower.so.\$(VERSION) " - LIB_SUFFIX=.so -fi - if test $optimise_b = yes; then MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED" fi @@ -53,7 +43,27 @@ AC_SUBST(MODULE_CXXFLAGS) AC_SUBST(MODULE_LDFLAGS) AC_SUBST(LIB_SUFFIX) -AC_PROG_CXX +# 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_FUNC_MEMCMP AC_FUNC_VPRINTF AC_CHECK_FUNCS(memmem snprintf ) diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc index b288735c1d..1a6b0e83a6 100644 --- a/flower/cpu-timer.cc +++ b/flower/cpu-timer.cc @@ -7,7 +7,7 @@ */ #include "cpu-timer.hh" - +#include // nextstep #ifndef CLOCKS_PER_SEC #ifdef CLK_TCK diff --git a/flower/include/Makefile.am b/flower/include/Makefile.am index 294e4f9f6c..2b9ef33c21 100644 --- a/flower/include/Makefile.am +++ b/flower/include/Makefile.am @@ -1,8 +1,8 @@ -# Automatically generated from ./lilypond-0.1.49/flower/include/Makefile.am.wild by bin/autowild -# Do not edit -# flower/lib/include/Makefile.am.wild +# Generated automatically by wild-perl 0.1# flower/lib/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 +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in index c6b3898e80..b52fb14ab9 100644 --- a/flower/include/Makefile.in +++ b/flower/include/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./flower/include/Makefile.am.wild by bin/autowild -# Do not edit -# flower/lib/include/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# flower/lib/include/Makefile.am.wild SHELL = /bin/sh @@ -47,20 +51,30 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AGE = @AGE@ CC = @CC@ +CURRENT = @CURRENT@ CXX = @CXX@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ LIB_SUFFIX = @LIB_SUFFIX@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MODULE_CXXFLAGS = @MODULE_CXXFLAGS@ MODULE_LDFLAGS = @MODULE_LDFLAGS@ +NM = @NM@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ +REVISION = @REVISION@ VERSION = @VERSION@ noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc @@ -82,30 +96,35 @@ default: all .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -114,10 +133,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = include distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ @@ -148,25 +163,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean @@ -180,6 +196,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh index 270d07aefb..2497910a29 100644 --- a/flower/include/libc-extension.hh +++ b/flower/include/libc-extension.hh @@ -13,6 +13,8 @@ #include "config.hh" +#include + char* strnlwr (char* start_l ,int n); char* strnupr (char* start_l, int n); diff --git a/flower/test/Makefile.am b/flower/test/Makefile.am index 6424e8496e..df20634f35 100644 --- a/flower/test/Makefile.am +++ b/flower/test/Makefile.am @@ -1,6 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/flower/test/Makefile.am.wild by bin/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 @@ -25,3 +23,5 @@ noinst_HEADERS = flower-test.hh INCLUDES = -I../include +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/flower/test/Makefile.in b/flower/test/Makefile.in index 006babd155..55bbf89ace 100644 --- a/flower/test/Makefile.in +++ b/flower/test/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./flower/test/Makefile.am.wild by bin/autowild -# Do not edit -# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# # project LilyPond -- the musical typesetter # title makefile for flowertest # file flower/test/Makefile.am.wild @@ -62,20 +66,30 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AGE = @AGE@ CC = @CC@ +CURRENT = @CURRENT@ CXX = @CXX@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ LIB_SUFFIX = @LIB_SUFFIX@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MODULE_CXXFLAGS = @MODULE_CXXFLAGS@ MODULE_LDFLAGS = @MODULE_LDFLAGS@ +NM = @NM@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ +REVISION = @REVISION@ VERSION = @VERSION@ EXTRA_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc @@ -101,30 +115,35 @@ default: all .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -133,10 +152,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = test distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu test/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ @@ -167,25 +182,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean @@ -199,6 +215,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/include/Makefile.in b/include/Makefile.in deleted file mode 100644 index eb0e19bb95..0000000000 --- a/include/Makefile.in +++ /dev/null @@ -1,181 +0,0 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am - -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Automatically generated from ./flower/include/Makefile.am.wild by bin/autowild -# Do not edit -# flower/lib/include/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 = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true -CC = @CC@ -CXX = @CXX@ -LIB_SUFFIX = @LIB_SUFFIX@ -MAKEINFO = @MAKEINFO@ -MODULE_CXXFLAGS = @MODULE_CXXFLAGS@ -MODULE_LDFLAGS = @MODULE_LDFLAGS@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -VERSION = @VERSION@ - -noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc - -EXTRA_DIST = Makefile.am.wild -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 include/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) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) - tags=; \ - here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = include - -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 - -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 - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/init/Makefile.am b/init/Makefile.am index 9a5e11f136..02e8dea88b 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -1,11 +1,9 @@ -# Automatically generated from ./lilypond-0.1.49/init/Makefile.am.wild by bin/autowild -# Do not edit -# init/Makefile.am.wild +# Generated automatically by wild-perl 0.1# init/Makefile.am.wild -INIFILES = dutch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly +INIFILES = dutch.ly dynamic.ly engraver.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly EXTRA_DIST = Makefile.am.wild $(INIFILES) -CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly +CLEANFILES = FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES)) @@ -20,3 +18,5 @@ install-data: uninstall-data: for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/init/Makefile.in b/init/Makefile.in index f99b968029..65368541a2 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./init/Makefile.am.wild by bin/autowild -# Do not edit -# init/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# init/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -85,10 +95,10 @@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ -INIFILES = dutch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly +INIFILES = dutch.ly dynamic.ly engraver.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly EXTRA_DIST = Makefile.am.wild $(INIFILES) -CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly +CLEANFILES = FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES)) @@ -150,25 +160,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -190,6 +201,8 @@ install-data: uninstall-data: for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/init/feta11.ly b/init/feta11.ly deleted file mode 100644 index bb43ba9adc..0000000000 --- a/init/feta11.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta11.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 4.12\pt -1.72\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 4.12\pt 0.00\pt 1.72\pt - "0o" "\\outsidewholerest" -1.72\pt 5.84\pt -1.72\pt 0.28\pt - "1o" "\\outsidehalfrest" -1.72\pt 5.84\pt -0.28\pt 1.72\pt - "2" "\\quartrest" 0.00\pt 2.97\pt 2.06\pt 9.90\pt - "3" "\\eighthrest" 0.00\pt 3.67\pt 2.75\pt 7.81\pt - "4" "\\sixteenthrest" 0.00\pt 4.27\pt 0.00\pt 7.81\pt - "5" "\\thirtysecondrest" 0.00\pt 4.81\pt 0.00\pt 10.56\pt - "6" "\\sixtyfourthrest" 0.00\pt 5.16\pt 0.00\pt 13.31\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 5.75\pt 0.00\pt 16.06\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 3.03\pt -4.12\pt 4.12\pt - "0" "\\natural" 0.00\pt 1.83\pt -4.12\pt 4.12\pt - "-1" "\\flat" -0.33\pt 2.20\pt -1.38\pt 5.50\pt - "-2" "\\flatflat" -0.33\pt 3.99\pt -1.38\pt 5.50\pt - "2" "\\sharpsharp" 0.00\pt 2.75\pt -1.38\pt 1.38\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 1.24\pt -0.62\pt 0.62\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 1.24\pt -1.38\pt 1.38\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt - "-1l" "\\brevisledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt - "-2" "\\longaball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt - "-2l" "\\longaledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt - "0" "\\wholeball" 0.00\pt 5.45\pt -1.51\pt 1.51\pt - "0l" "\\wholeledger" -1.36\pt 6.81\pt -0.28\pt 0.28\pt - "1" "\\halfball" 0.00\pt 3.79\pt -1.51\pt 1.51\pt - "1l" "\\halfledger" -0.95\pt 4.74\pt -0.28\pt 0.28\pt - "2" "\\quartball" 0.00\pt 3.63\pt -1.51\pt 1.51\pt - "2l" "\\quartledger" -0.91\pt 4.54\pt -0.28\pt 0.28\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -3.64\pt 3.64\pt -0.21\pt 3.99\pt - "dfermata" "\\dfermata" -3.64\pt 3.64\pt -3.99\pt 0.21\pt - "sforzato" "\\sforzatoaccent" -2.47\pt 2.47\pt -1.38\pt 1.38\pt - "staccato" "\\staccato" -0.41\pt 0.41\pt -0.41\pt 0.41\pt - "ustaccatissimo" "\\ustaccatissimo" -0.55\pt 0.55\pt -0.20\pt 2.75\pt - "dstaccatissimo" "\\dstaccatissimo" -0.55\pt 0.55\pt -2.75\pt 0.20\pt - "tenuto" "\\tenuto" -2.47\pt 2.47\pt -0.17\pt 0.17\pt - "umarcato" "\\umarcato" -1.38\pt 1.38\pt 0.00\pt 3.03\pt - "dmarcato" "\\dmarcato" -1.38\pt 1.38\pt -3.03\pt 0.00\pt - "open" "\\ouvert" -1.10\pt 1.10\pt -1.38\pt 1.38\pt - "stopped" "\\plusstop" -1.51\pt 1.51\pt -1.51\pt 1.51\pt - "upbow" "\\upbow" -1.79\pt 1.79\pt 0.00\pt 5.72\pt - "downbow" "\\downbow" -2.06\pt 2.06\pt 0.00\pt 3.67\pt - "turn" "\\turn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt - "trill" "\\trill" -2.75\pt 2.75\pt 0.00\pt 6.19\pt - "upedalheel" "\\upedalheel" -1.38\pt 1.38\pt -1.38\pt 1.83\pt - "dpedalheel" "\\dpedalheel" -1.38\pt 1.38\pt -1.83\pt 1.38\pt - "upedaltoe" "\\upedaltoe" -1.38\pt 1.38\pt 0.00\pt 4.12\pt - "dpedaltoe" "\\dpedaltoe" -1.38\pt 1.38\pt -4.12\pt 0.00\pt - "flageolet" "\\flageolet" -1.47\pt 1.47\pt -1.47\pt 1.47\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.14\pt 3.39\pt -8.43\pt 0.14\pt - "u4" "\\sixteenthflag" -0.14\pt 3.39\pt -9.80\pt 0.14\pt - "u5" "\\thirtysecondflag" -0.14\pt 3.39\pt -11.87\pt 0.14\pt - "u6" "\\sixtyfourthflag" -0.14\pt 3.39\pt -14.62\pt 0.14\pt - "d3" "\\deighthflag" -0.14\pt 3.76\pt -0.14\pt 8.02\pt - "d4" "\\dsixteenthflag" -0.14\pt 3.76\pt -0.14\pt 8.43\pt - "d5" "\\dthirtysecondflag" -0.14\pt 3.76\pt -0.14\pt 10.77\pt - "d6" "\\dsixtyfourthflag" -0.14\pt 3.76\pt -0.14\pt 12.14\pt - } - "clefs" = \table { - "alto" "\\altoclef" -2.75\pt 10.24\pt -5.50\pt 5.50\pt - "alto_change" "\\caltoclef" -2.20\pt 8.19\pt -4.40\pt 4.40\pt - "bass" "\\bassclef" -1.38\pt 9.90\pt -6.88\pt 2.75\pt - "bass_change" "\\cbassclef" -1.10\pt 7.92\pt -5.50\pt 2.20\pt - "violin" "\\violinclef" -2.40\pt 10.28\pt -8.25\pt 13.75\pt - "violin_change" "\\cviolinclef" -2.08\pt 8.06\pt -6.60\pt 11.00\pt - } - % } % $name diff --git a/init/feta13.ly b/init/feta13.ly deleted file mode 100644 index cc78398e91..0000000000 --- a/init/feta13.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta13.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 4.88\pt -2.03\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 4.88\pt 0.00\pt 2.03\pt - "0o" "\\outsidewholerest" -2.03\pt 6.91\pt -2.03\pt 0.33\pt - "1o" "\\outsidehalfrest" -2.03\pt 6.91\pt -0.33\pt 2.03\pt - "2" "\\quartrest" 0.00\pt 3.51\pt 2.44\pt 11.70\pt - "3" "\\eighthrest" 0.00\pt 4.33\pt 3.25\pt 9.24\pt - "4" "\\sixteenthrest" 0.00\pt 5.04\pt 0.00\pt 9.24\pt - "5" "\\thirtysecondrest" 0.00\pt 5.69\pt 0.00\pt 12.49\pt - "6" "\\sixtyfourthrest" 0.00\pt 6.10\pt 0.00\pt 15.74\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 6.79\pt 0.00\pt 18.99\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 3.58\pt -4.88\pt 4.88\pt - "0" "\\natural" 0.00\pt 2.17\pt -4.88\pt 4.88\pt - "-1" "\\flat" -0.39\pt 2.60\pt -1.62\pt 6.50\pt - "-2" "\\flatflat" -0.39\pt 4.71\pt -1.62\pt 6.50\pt - "2" "\\sharpsharp" 0.00\pt 3.25\pt -1.62\pt 1.62\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 1.46\pt -0.73\pt 0.73\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 1.46\pt -1.62\pt 1.62\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt - "-1l" "\\brevisledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt - "-2" "\\longaball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt - "-2l" "\\longaledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt - "0" "\\wholeball" 0.00\pt 6.44\pt -1.79\pt 1.79\pt - "0l" "\\wholeledger" -1.61\pt 8.04\pt -0.33\pt 0.33\pt - "1" "\\halfball" 0.00\pt 4.48\pt -1.79\pt 1.79\pt - "1l" "\\halfledger" -1.12\pt 5.60\pt -0.33\pt 0.33\pt - "2" "\\quartball" 0.00\pt 4.29\pt -1.79\pt 1.79\pt - "2l" "\\quartledger" -1.07\pt 5.37\pt -0.33\pt 0.33\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -4.31\pt 4.31\pt -0.24\pt 4.71\pt - "dfermata" "\\dfermata" -4.31\pt 4.31\pt -4.71\pt 0.24\pt - "sforzato" "\\sforzatoaccent" -2.92\pt 2.92\pt -1.62\pt 1.62\pt - "staccato" "\\staccato" -0.49\pt 0.49\pt -0.49\pt 0.49\pt - "ustaccatissimo" "\\ustaccatissimo" -0.65\pt 0.65\pt -0.20\pt 3.25\pt - "dstaccatissimo" "\\dstaccatissimo" -0.65\pt 0.65\pt -3.25\pt 0.20\pt - "tenuto" "\\tenuto" -2.92\pt 2.92\pt -0.20\pt 0.20\pt - "umarcato" "\\umarcato" -1.62\pt 1.62\pt 0.00\pt 3.58\pt - "dmarcato" "\\dmarcato" -1.62\pt 1.62\pt -3.58\pt 0.00\pt - "open" "\\ouvert" -1.30\pt 1.30\pt -1.62\pt 1.62\pt - "stopped" "\\plusstop" -1.79\pt 1.79\pt -1.79\pt 1.79\pt - "upbow" "\\upbow" -2.11\pt 2.11\pt 0.00\pt 6.76\pt - "downbow" "\\downbow" -2.44\pt 2.44\pt 0.00\pt 4.33\pt - "turn" "\\turn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt - "trill" "\\trill" -3.25\pt 3.25\pt 0.00\pt 7.31\pt - "upedalheel" "\\upedalheel" -1.62\pt 1.62\pt -1.62\pt 2.17\pt - "dpedalheel" "\\dpedalheel" -1.62\pt 1.62\pt -2.17\pt 1.62\pt - "upedaltoe" "\\upedaltoe" -1.62\pt 1.62\pt 0.00\pt 4.88\pt - "dpedaltoe" "\\dpedaltoe" -1.62\pt 1.62\pt -4.88\pt 0.00\pt - "flageolet" "\\flageolet" -1.73\pt 1.73\pt -1.73\pt 1.73\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.16\pt 4.01\pt -9.96\pt 0.16\pt - "u4" "\\sixteenthflag" -0.16\pt 4.01\pt -11.59\pt 0.16\pt - "u5" "\\thirtysecondflag" -0.16\pt 4.01\pt -14.02\pt 0.16\pt - "u6" "\\sixtyfourthflag" -0.16\pt 4.01\pt -17.27\pt 0.16\pt - "d3" "\\deighthflag" -0.16\pt 4.44\pt -0.16\pt 9.47\pt - "d4" "\\dsixteenthflag" -0.16\pt 4.44\pt -0.16\pt 9.96\pt - "d5" "\\dthirtysecondflag" -0.16\pt 4.44\pt -0.16\pt 12.72\pt - "d6" "\\dsixtyfourthflag" -0.16\pt 4.44\pt -0.16\pt 14.35\pt - } - "clefs" = \table { - "alto" "\\altoclef" -3.25\pt 12.10\pt -6.50\pt 6.50\pt - "alto_change" "\\caltoclef" -2.60\pt 9.68\pt -5.20\pt 5.20\pt - "bass" "\\bassclef" -1.62\pt 11.70\pt -8.12\pt 3.25\pt - "bass_change" "\\cbassclef" -1.30\pt 9.36\pt -6.50\pt 2.60\pt - "violin" "\\violinclef" -2.83\pt 12.15\pt -9.75\pt 16.25\pt - "violin_change" "\\cviolinclef" -2.46\pt 9.52\pt -7.80\pt 13.00\pt - } - % } % $name diff --git a/init/feta16.ly b/init/feta16.ly deleted file mode 100644 index 8f9e9a849c..0000000000 --- a/init/feta16.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta16.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 6.00\pt -2.50\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 6.00\pt 0.00\pt 2.50\pt - "0o" "\\outsidewholerest" -2.50\pt 8.50\pt -2.50\pt 0.40\pt - "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.40\pt 2.50\pt - "2" "\\quartrest" 0.00\pt 4.32\pt 3.00\pt 14.40\pt - "3" "\\eighthrest" 0.00\pt 5.33\pt 4.00\pt 11.37\pt - "4" "\\sixteenthrest" 0.00\pt 6.21\pt 0.00\pt 11.37\pt - "5" "\\thirtysecondrest" 0.00\pt 7.00\pt 0.00\pt 15.37\pt - "6" "\\sixtyfourthrest" 0.00\pt 7.51\pt 0.00\pt 19.37\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 8.36\pt 0.00\pt 23.37\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 4.40\pt -6.00\pt 6.00\pt - "0" "\\natural" 0.00\pt 2.67\pt -6.00\pt 6.00\pt - "-1" "\\flat" -0.48\pt 3.20\pt -2.00\pt 8.00\pt - "-2" "\\flatflat" -0.48\pt 5.80\pt -2.00\pt 8.00\pt - "2" "\\sharpsharp" 0.00\pt 4.00\pt -2.00\pt 2.00\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 1.80\pt -0.90\pt 0.90\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 1.80\pt -2.00\pt 2.00\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt - "-1l" "\\brevisledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt - "-2" "\\longaball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt - "-2l" "\\longaledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt - "0" "\\wholeball" 0.00\pt 7.92\pt -2.20\pt 2.20\pt - "0l" "\\wholeledger" -1.98\pt 9.90\pt -0.40\pt 0.40\pt - "1" "\\halfball" 0.00\pt 5.51\pt -2.20\pt 2.20\pt - "1l" "\\halfledger" -1.38\pt 6.89\pt -0.40\pt 0.40\pt - "2" "\\quartball" 0.00\pt 5.28\pt -2.20\pt 2.20\pt - "2l" "\\quartledger" -1.32\pt 6.61\pt -0.40\pt 0.40\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt - "dfermata" "\\dfermata" -5.30\pt 5.30\pt -5.80\pt 0.30\pt - "sforzato" "\\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt - "staccato" "\\staccato" -0.60\pt 0.60\pt -0.60\pt 0.60\pt - "ustaccatissimo" "\\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt - "dstaccatissimo" "\\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt - "tenuto" "\\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt - "umarcato" "\\umarcato" -2.00\pt 2.00\pt 0.00\pt 4.40\pt - "dmarcato" "\\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt - "open" "\\ouvert" -1.60\pt 1.60\pt -2.00\pt 2.00\pt - "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt - "upbow" "\\upbow" -2.60\pt 2.60\pt 0.00\pt 8.32\pt - "downbow" "\\downbow" -3.00\pt 3.00\pt 0.00\pt 5.33\pt - "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt - "trill" "\\trill" -4.00\pt 4.00\pt 0.00\pt 9.00\pt - "upedalheel" "\\upedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt - "dpedalheel" "\\dpedalheel" -2.00\pt 2.00\pt -2.67\pt 2.00\pt - "upedaltoe" "\\upedaltoe" -2.00\pt 2.00\pt 0.00\pt 6.00\pt - "dpedaltoe" "\\dpedaltoe" -2.00\pt 2.00\pt -6.00\pt 0.00\pt - "flageolet" "\\flageolet" -2.13\pt 2.13\pt -2.13\pt 2.13\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.20\pt 4.94\pt -12.26\pt 0.20\pt - "u4" "\\sixteenthflag" -0.20\pt 4.94\pt -14.26\pt 0.20\pt - "u5" "\\thirtysecondflag" -0.20\pt 4.94\pt -17.26\pt 0.20\pt - "u6" "\\sixtyfourthflag" -0.20\pt 4.94\pt -21.26\pt 0.20\pt - "d3" "\\deighthflag" -0.20\pt 5.46\pt -0.20\pt 11.66\pt - "d4" "\\dsixteenthflag" -0.20\pt 5.46\pt -0.20\pt 12.26\pt - "d5" "\\dthirtysecondflag" -0.20\pt 5.46\pt -0.20\pt 15.66\pt - "d6" "\\dsixtyfourthflag" -0.20\pt 5.46\pt -0.20\pt 17.66\pt - } - "clefs" = \table { - "alto" "\\altoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt - "alto_change" "\\caltoclef" -3.20\pt 11.91\pt -6.40\pt 6.40\pt - "bass" "\\bassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt - "bass_change" "\\cbassclef" -1.60\pt 11.52\pt -8.00\pt 3.20\pt - "violin" "\\violinclef" -3.49\pt 14.95\pt -12.00\pt 20.00\pt - "violin_change" "\\cviolinclef" -3.03\pt 11.72\pt -9.60\pt 16.00\pt - } - % } % $name diff --git a/init/feta19.ly b/init/feta19.ly deleted file mode 100644 index be4cac0d8e..0000000000 --- a/init/feta19.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta19.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 7.12\pt -2.97\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 7.12\pt 0.00\pt 2.97\pt - "0o" "\\outsidewholerest" -2.97\pt 10.09\pt -2.97\pt 0.48\pt - "1o" "\\outsidehalfrest" -2.97\pt 10.09\pt -0.48\pt 2.97\pt - "2" "\\quartrest" 0.00\pt 5.13\pt 3.56\pt 17.10\pt - "3" "\\eighthrest" 0.00\pt 6.33\pt 4.75\pt 13.50\pt - "4" "\\sixteenthrest" 0.00\pt 7.37\pt 0.00\pt 13.50\pt - "5" "\\thirtysecondrest" 0.00\pt 8.32\pt 0.00\pt 18.25\pt - "6" "\\sixtyfourthrest" 0.00\pt 8.92\pt 0.00\pt 23.00\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 9.93\pt 0.00\pt 27.75\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 5.23\pt -7.12\pt 7.12\pt - "0" "\\natural" 0.00\pt 3.17\pt -7.12\pt 7.12\pt - "-1" "\\flat" -0.57\pt 3.80\pt -2.38\pt 9.50\pt - "-2" "\\flatflat" -0.57\pt 6.89\pt -2.38\pt 9.50\pt - "2" "\\sharpsharp" 0.00\pt 4.75\pt -2.38\pt 2.38\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 2.14\pt -1.07\pt 1.07\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 2.14\pt -2.38\pt 2.38\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt - "-1l" "\\brevisledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt - "-2" "\\longaball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt - "-2l" "\\longaledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt - "0" "\\wholeball" 0.00\pt 9.41\pt -2.61\pt 2.61\pt - "0l" "\\wholeledger" -2.35\pt 11.76\pt -0.48\pt 0.48\pt - "1" "\\halfball" 0.00\pt 6.54\pt -2.61\pt 2.61\pt - "1l" "\\halfledger" -1.64\pt 8.18\pt -0.48\pt 0.48\pt - "2" "\\quartball" 0.00\pt 6.27\pt -2.61\pt 2.61\pt - "2l" "\\quartledger" -1.57\pt 7.84\pt -0.48\pt 0.48\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -6.29\pt 6.29\pt -0.36\pt 6.89\pt - "dfermata" "\\dfermata" -6.29\pt 6.29\pt -6.89\pt 0.36\pt - "sforzato" "\\sforzatoaccent" -4.27\pt 4.27\pt -2.38\pt 2.38\pt - "staccato" "\\staccato" -0.71\pt 0.71\pt -0.71\pt 0.71\pt - "ustaccatissimo" "\\ustaccatissimo" -0.95\pt 0.95\pt -0.20\pt 4.75\pt - "dstaccatissimo" "\\dstaccatissimo" -0.95\pt 0.95\pt -4.75\pt 0.20\pt - "tenuto" "\\tenuto" -4.27\pt 4.27\pt -0.29\pt 0.29\pt - "umarcato" "\\umarcato" -2.38\pt 2.38\pt 0.00\pt 5.23\pt - "dmarcato" "\\dmarcato" -2.38\pt 2.38\pt -5.23\pt 0.00\pt - "open" "\\ouvert" -1.90\pt 1.90\pt -2.38\pt 2.38\pt - "stopped" "\\plusstop" -2.61\pt 2.61\pt -2.61\pt 2.61\pt - "upbow" "\\upbow" -3.09\pt 3.09\pt 0.00\pt 9.88\pt - "downbow" "\\downbow" -3.56\pt 3.56\pt 0.00\pt 6.33\pt - "turn" "\\turn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt - "trill" "\\trill" -4.75\pt 4.75\pt 0.00\pt 10.69\pt - "upedalheel" "\\upedalheel" -2.38\pt 2.38\pt -2.38\pt 3.17\pt - "dpedalheel" "\\dpedalheel" -2.38\pt 2.38\pt -3.17\pt 2.38\pt - "upedaltoe" "\\upedaltoe" -2.38\pt 2.38\pt 0.00\pt 7.12\pt - "dpedaltoe" "\\dpedaltoe" -2.38\pt 2.38\pt -7.12\pt 0.00\pt - "flageolet" "\\flageolet" -2.53\pt 2.53\pt -2.53\pt 2.53\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.24\pt 5.86\pt -14.56\pt 0.24\pt - "u4" "\\sixteenthflag" -0.24\pt 5.86\pt -16.93\pt 0.24\pt - "u5" "\\thirtysecondflag" -0.24\pt 5.86\pt -20.50\pt 0.24\pt - "u6" "\\sixtyfourthflag" -0.24\pt 5.86\pt -25.25\pt 0.24\pt - "d3" "\\deighthflag" -0.24\pt 6.49\pt -0.24\pt 13.85\pt - "d4" "\\dsixteenthflag" -0.24\pt 6.49\pt -0.24\pt 14.56\pt - "d5" "\\dthirtysecondflag" -0.24\pt 6.49\pt -0.24\pt 18.60\pt - "d6" "\\dsixtyfourthflag" -0.24\pt 6.49\pt -0.24\pt 20.97\pt - } - "clefs" = \table { - "alto" "\\altoclef" -4.75\pt 17.68\pt -9.50\pt 9.50\pt - "alto_change" "\\caltoclef" -3.80\pt 14.14\pt -7.60\pt 7.60\pt - "bass" "\\bassclef" -2.38\pt 17.10\pt -11.88\pt 4.75\pt - "bass_change" "\\cbassclef" -1.90\pt 13.68\pt -9.50\pt 3.80\pt - "violin" "\\violinclef" -4.14\pt 17.75\pt -14.25\pt 23.75\pt - "violin_change" "\\cviolinclef" -3.60\pt 13.92\pt -11.40\pt 19.00\pt - } - % } % $name diff --git a/init/feta20.ly b/init/feta20.ly deleted file mode 100644 index 4b83db0235..0000000000 --- a/init/feta20.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta20.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 7.50\pt -3.12\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 7.50\pt 0.00\pt 3.12\pt - "0o" "\\outsidewholerest" -3.12\pt 10.62\pt -3.12\pt 0.50\pt - "1o" "\\outsidehalfrest" -3.12\pt 10.62\pt -0.50\pt 3.12\pt - "2" "\\quartrest" 0.00\pt 5.40\pt 3.75\pt 18.00\pt - "3" "\\eighthrest" 0.00\pt 6.67\pt 5.00\pt 14.21\pt - "4" "\\sixteenthrest" 0.00\pt 7.76\pt 0.00\pt 14.21\pt - "5" "\\thirtysecondrest" 0.00\pt 8.75\pt 0.00\pt 19.21\pt - "6" "\\sixtyfourthrest" 0.00\pt 9.38\pt 0.00\pt 24.21\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 10.45\pt 0.00\pt 29.21\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 5.50\pt -7.50\pt 7.50\pt - "0" "\\natural" 0.00\pt 3.33\pt -7.50\pt 7.50\pt - "-1" "\\flat" -0.60\pt 4.00\pt -2.50\pt 10.00\pt - "-2" "\\flatflat" -0.60\pt 7.25\pt -2.50\pt 10.00\pt - "2" "\\sharpsharp" 0.00\pt 5.00\pt -2.50\pt 2.50\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 2.25\pt -1.12\pt 1.12\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 2.25\pt -2.50\pt 2.50\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt - "-1l" "\\brevisledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt - "-2" "\\longaball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt - "-2l" "\\longaledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt - "0" "\\wholeball" 0.00\pt 9.90\pt -2.75\pt 2.75\pt - "0l" "\\wholeledger" -2.48\pt 12.38\pt -0.50\pt 0.50\pt - "1" "\\halfball" 0.00\pt 6.89\pt -2.75\pt 2.75\pt - "1l" "\\halfledger" -1.72\pt 8.61\pt -0.50\pt 0.50\pt - "2" "\\quartball" 0.00\pt 6.61\pt -2.75\pt 2.75\pt - "2l" "\\quartledger" -1.65\pt 8.26\pt -0.50\pt 0.50\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -6.63\pt 6.63\pt -0.38\pt 7.25\pt - "dfermata" "\\dfermata" -6.63\pt 6.63\pt -7.25\pt 0.38\pt - "sforzato" "\\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt - "staccato" "\\staccato" -0.75\pt 0.75\pt -0.75\pt 0.75\pt - "ustaccatissimo" "\\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt - "dstaccatissimo" "\\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt - "tenuto" "\\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt - "umarcato" "\\umarcato" -2.50\pt 2.50\pt 0.00\pt 5.50\pt - "dmarcato" "\\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt - "open" "\\ouvert" -2.00\pt 2.00\pt -2.50\pt 2.50\pt - "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt - "upbow" "\\upbow" -3.25\pt 3.25\pt 0.00\pt 10.40\pt - "downbow" "\\downbow" -3.75\pt 3.75\pt 0.00\pt 6.67\pt - "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt - "trill" "\\trill" -5.00\pt 5.00\pt 0.00\pt 11.25\pt - "upedalheel" "\\upedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt - "dpedalheel" "\\dpedalheel" -2.50\pt 2.50\pt -3.33\pt 2.50\pt - "upedaltoe" "\\upedaltoe" -2.50\pt 2.50\pt 0.00\pt 7.50\pt - "dpedaltoe" "\\dpedaltoe" -2.50\pt 2.50\pt -7.50\pt 0.00\pt - "flageolet" "\\flageolet" -2.67\pt 2.67\pt -2.67\pt 2.67\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.25\pt 6.17\pt -15.33\pt 0.25\pt - "u4" "\\sixteenthflag" -0.25\pt 6.17\pt -17.83\pt 0.25\pt - "u5" "\\thirtysecondflag" -0.25\pt 6.17\pt -21.58\pt 0.25\pt - "u6" "\\sixtyfourthflag" -0.25\pt 6.17\pt -26.58\pt 0.25\pt - "d3" "\\deighthflag" -0.25\pt 6.83\pt -0.25\pt 14.58\pt - "d4" "\\dsixteenthflag" -0.25\pt 6.83\pt -0.25\pt 15.33\pt - "d5" "\\dthirtysecondflag" -0.25\pt 6.83\pt -0.25\pt 19.58\pt - "d6" "\\dsixtyfourthflag" -0.25\pt 6.83\pt -0.25\pt 22.08\pt - } - "clefs" = \table { - "alto" "\\altoclef" -5.00\pt 18.61\pt -10.00\pt 10.00\pt - "alto_change" "\\caltoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt - "bass" "\\bassclef" -2.50\pt 18.00\pt -12.50\pt 5.00\pt - "bass_change" "\\cbassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt - "violin" "\\violinclef" -4.36\pt 18.69\pt -15.00\pt 25.00\pt - "violin_change" "\\cviolinclef" -3.79\pt 14.65\pt -12.00\pt 20.00\pt - } - % } % $name diff --git a/init/feta23.ly b/init/feta23.ly deleted file mode 100644 index e0771ff065..0000000000 --- a/init/feta23.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta23.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 8.44\pt -3.52\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 8.44\pt 0.00\pt 3.52\pt - "0o" "\\outsidewholerest" -3.52\pt 11.95\pt -3.52\pt 0.56\pt - "1o" "\\outsidehalfrest" -3.52\pt 11.95\pt -0.56\pt 3.52\pt - "2" "\\quartrest" 0.00\pt 6.08\pt 4.22\pt 20.25\pt - "3" "\\eighthrest" 0.00\pt 7.50\pt 5.62\pt 15.98\pt - "4" "\\sixteenthrest" 0.00\pt 8.73\pt 0.00\pt 15.98\pt - "5" "\\thirtysecondrest" 0.00\pt 9.85\pt 0.00\pt 21.61\pt - "6" "\\sixtyfourthrest" 0.00\pt 10.56\pt 0.00\pt 27.23\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 11.75\pt 0.00\pt 32.86\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 6.19\pt -8.44\pt 8.44\pt - "0" "\\natural" 0.00\pt 3.75\pt -8.44\pt 8.44\pt - "-1" "\\flat" -0.68\pt 4.50\pt -2.81\pt 11.25\pt - "-2" "\\flatflat" -0.68\pt 8.16\pt -2.81\pt 11.25\pt - "2" "\\sharpsharp" 0.00\pt 5.62\pt -2.81\pt 2.81\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 2.53\pt -1.27\pt 1.27\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 2.53\pt -2.81\pt 2.81\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt - "-1l" "\\brevisledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt - "-2" "\\longaball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt - "-2l" "\\longaledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt - "0" "\\wholeball" 0.00\pt 11.14\pt -3.09\pt 3.09\pt - "0l" "\\wholeledger" -2.78\pt 13.92\pt -0.56\pt 0.56\pt - "1" "\\halfball" 0.00\pt 7.75\pt -3.09\pt 3.09\pt - "1l" "\\halfledger" -1.94\pt 9.69\pt -0.56\pt 0.56\pt - "2" "\\quartball" 0.00\pt 7.43\pt -3.09\pt 3.09\pt - "2l" "\\quartledger" -1.86\pt 9.29\pt -0.56\pt 0.56\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -7.45\pt 7.45\pt -0.42\pt 8.16\pt - "dfermata" "\\dfermata" -7.45\pt 7.45\pt -8.16\pt 0.42\pt - "sforzato" "\\sforzatoaccent" -5.06\pt 5.06\pt -2.81\pt 2.81\pt - "staccato" "\\staccato" -0.84\pt 0.84\pt -0.84\pt 0.84\pt - "ustaccatissimo" "\\ustaccatissimo" -1.13\pt 1.13\pt -0.20\pt 5.63\pt - "dstaccatissimo" "\\dstaccatissimo" -1.13\pt 1.13\pt -5.63\pt 0.20\pt - "tenuto" "\\tenuto" -5.06\pt 5.06\pt -0.34\pt 0.34\pt - "umarcato" "\\umarcato" -2.81\pt 2.81\pt 0.00\pt 6.19\pt - "dmarcato" "\\dmarcato" -2.81\pt 2.81\pt -6.19\pt 0.00\pt - "open" "\\ouvert" -2.25\pt 2.25\pt -2.81\pt 2.81\pt - "stopped" "\\plusstop" -3.09\pt 3.09\pt -3.09\pt 3.09\pt - "upbow" "\\upbow" -3.66\pt 3.66\pt 0.00\pt 11.70\pt - "downbow" "\\downbow" -4.22\pt 4.22\pt 0.00\pt 7.50\pt - "turn" "\\turn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt - "trill" "\\trill" -5.62\pt 5.62\pt 0.00\pt 12.66\pt - "upedalheel" "\\upedalheel" -2.81\pt 2.81\pt -2.81\pt 3.75\pt - "dpedalheel" "\\dpedalheel" -2.81\pt 2.81\pt -3.75\pt 2.81\pt - "upedaltoe" "\\upedaltoe" -2.81\pt 2.81\pt 0.00\pt 8.44\pt - "dpedaltoe" "\\dpedaltoe" -2.81\pt 2.81\pt -8.44\pt 0.00\pt - "flageolet" "\\flageolet" -3.00\pt 3.00\pt -3.00\pt 3.00\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.28\pt 6.94\pt -17.24\pt 0.28\pt - "u4" "\\sixteenthflag" -0.28\pt 6.94\pt -20.05\pt 0.28\pt - "u5" "\\thirtysecondflag" -0.28\pt 6.94\pt -24.27\pt 0.28\pt - "u6" "\\sixtyfourthflag" -0.28\pt 6.94\pt -29.90\pt 0.28\pt - "d3" "\\deighthflag" -0.28\pt 7.68\pt -0.28\pt 16.40\pt - "d4" "\\dsixteenthflag" -0.28\pt 7.68\pt -0.28\pt 17.24\pt - "d5" "\\dthirtysecondflag" -0.28\pt 7.68\pt -0.28\pt 22.02\pt - "d6" "\\dsixtyfourthflag" -0.28\pt 7.68\pt -0.28\pt 24.83\pt - } - "clefs" = \table { - "alto" "\\altoclef" -5.62\pt 20.94\pt -11.25\pt 11.25\pt - "alto_change" "\\caltoclef" -4.50\pt 16.75\pt -9.00\pt 9.00\pt - "bass" "\\bassclef" -2.81\pt 20.25\pt -14.06\pt 5.62\pt - "bass_change" "\\cbassclef" -2.25\pt 16.20\pt -11.25\pt 4.50\pt - "violin" "\\violinclef" -4.90\pt 21.02\pt -16.88\pt 28.12\pt - "violin_change" "\\cviolinclef" -4.26\pt 16.48\pt -13.50\pt 22.50\pt - } - % } % $name diff --git a/init/feta26.ly b/init/feta26.ly deleted file mode 100644 index 0ffe381d52..0000000000 --- a/init/feta26.ly +++ /dev/null @@ -1,81 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta26.log -% name=\symboltables { - "rests" = \table { - "0" "\\wholerest" 0.00\pt 9.75\pt -4.06\pt 0.00\pt - "1" "\\halfrest" 0.00\pt 9.75\pt 0.00\pt 4.06\pt - "0o" "\\outsidewholerest" -4.06\pt 13.81\pt -4.06\pt 0.65\pt - "1o" "\\outsidehalfrest" -4.06\pt 13.81\pt -0.65\pt 4.06\pt - "2" "\\quartrest" 0.00\pt 7.02\pt 4.88\pt 23.40\pt - "3" "\\eighthrest" 0.00\pt 8.67\pt 6.50\pt 18.47\pt - "4" "\\sixteenthrest" 0.00\pt 10.08\pt 0.00\pt 18.47\pt - "5" "\\thirtysecondrest" 0.00\pt 11.38\pt 0.00\pt 24.97\pt - "6" "\\sixtyfourthrest" 0.00\pt 12.20\pt 0.00\pt 31.47\pt - "7" "\\hundredtwentyeighthrest" 0.00\pt 13.58\pt 0.00\pt 37.97\pt - } - "accidentals" = \table { - "1" "\\sharp" 0.00\pt 7.15\pt -9.75\pt 9.75\pt - "0" "\\natural" 0.00\pt 4.33\pt -9.75\pt 9.75\pt - "-1" "\\flat" -0.78\pt 5.20\pt -3.25\pt 13.00\pt - "-2" "\\flatflat" -0.78\pt 9.42\pt -3.25\pt 13.00\pt - "2" "\\sharpsharp" 0.00\pt 6.50\pt -3.25\pt 3.25\pt - } - "dots" = \table { - "dot" "\\dot" 0.00\pt 2.92\pt -1.46\pt 1.46\pt - "repeatcolon" "\\repeatcolon" 0.00\pt 2.92\pt -3.25\pt 3.25\pt - } - "balls" = \table { - "-1" "\\brevisball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt - "-1l" "\\brevisledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt - "-2" "\\longaball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt - "-2l" "\\longaledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt - "0" "\\wholeball" 0.00\pt 12.87\pt -3.58\pt 3.58\pt - "0l" "\\wholeledger" -3.22\pt 16.09\pt -0.65\pt 0.65\pt - "1" "\\halfball" 0.00\pt 8.95\pt -3.58\pt 3.58\pt - "1l" "\\halfledger" -2.24\pt 11.19\pt -0.65\pt 0.65\pt - "2" "\\quartball" 0.00\pt 8.59\pt -3.58\pt 3.58\pt - "2l" "\\quartledger" -2.15\pt 10.73\pt -0.65\pt 0.65\pt - } - "scripts" = \table { - "ufermata" "\\ufermata" -8.61\pt 8.61\pt -0.49\pt 9.43\pt - "dfermata" "\\dfermata" -8.61\pt 8.61\pt -9.43\pt 0.49\pt - "sforzato" "\\sforzatoaccent" -5.85\pt 5.85\pt -3.25\pt 3.25\pt - "staccato" "\\staccato" -0.98\pt 0.98\pt -0.98\pt 0.98\pt - "ustaccatissimo" "\\ustaccatissimo" -1.30\pt 1.30\pt -0.20\pt 6.50\pt - "dstaccatissimo" "\\dstaccatissimo" -1.30\pt 1.30\pt -6.50\pt 0.20\pt - "tenuto" "\\tenuto" -5.85\pt 5.85\pt -0.39\pt 0.39\pt - "umarcato" "\\umarcato" -3.25\pt 3.25\pt 0.00\pt 7.15\pt - "dmarcato" "\\dmarcato" -3.25\pt 3.25\pt -7.15\pt 0.00\pt - "open" "\\ouvert" -2.60\pt 2.60\pt -3.25\pt 3.25\pt - "stopped" "\\plusstop" -3.58\pt 3.58\pt -3.58\pt 3.58\pt - "upbow" "\\upbow" -4.23\pt 4.23\pt 0.00\pt 13.52\pt - "downbow" "\\downbow" -4.88\pt 4.88\pt 0.00\pt 8.67\pt - "turn" "\\turn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt - "trill" "\\trill" -6.50\pt 6.50\pt 0.00\pt 14.62\pt - "upedalheel" "\\upedalheel" -3.25\pt 3.25\pt -3.25\pt 4.33\pt - "dpedalheel" "\\dpedalheel" -3.25\pt 3.25\pt -4.33\pt 3.25\pt - "upedaltoe" "\\upedaltoe" -3.25\pt 3.25\pt 0.00\pt 9.75\pt - "dpedaltoe" "\\dpedaltoe" -3.25\pt 3.25\pt -9.75\pt 0.00\pt - "flageolet" "\\flageolet" -3.47\pt 3.47\pt -3.47\pt 3.47\pt - } - "flags" = \table { - "u3" "\\eighthflag" -0.33\pt 8.02\pt -19.92\pt 0.33\pt - "u4" "\\sixteenthflag" -0.33\pt 8.02\pt -23.17\pt 0.33\pt - "u5" "\\thirtysecondflag" -0.33\pt 8.02\pt -28.05\pt 0.33\pt - "u6" "\\sixtyfourthflag" -0.33\pt 8.02\pt -34.55\pt 0.33\pt - "d3" "\\deighthflag" -0.33\pt 8.88\pt -0.33\pt 18.95\pt - "d4" "\\dsixteenthflag" -0.33\pt 8.88\pt -0.33\pt 19.92\pt - "d5" "\\dthirtysecondflag" -0.33\pt 8.88\pt -0.33\pt 25.45\pt - "d6" "\\dsixtyfourthflag" -0.33\pt 8.88\pt -0.33\pt 28.70\pt - } - "clefs" = \table { - "alto" "\\altoclef" -6.50\pt 24.19\pt -13.00\pt 13.00\pt - "alto_change" "\\caltoclef" -5.20\pt 19.36\pt -10.40\pt 10.40\pt - "bass" "\\bassclef" -3.25\pt 23.40\pt -16.25\pt 6.50\pt - "bass_change" "\\cbassclef" -2.60\pt 18.72\pt -13.00\pt 5.20\pt - "violin" "\\violinclef" -5.66\pt 24.29\pt -19.50\pt 32.50\pt - "violin_change" "\\cviolinclef" -4.92\pt 19.04\pt -15.60\pt 26.00\pt - } - % } % $name diff --git a/init/script.ly b/init/script.ly index 7b70c66a4a..951327232c 100644 --- a/init/script.ly +++ b/init/script.ly @@ -54,3 +54,10 @@ front = \script { "front" 0 -1 1 0 0 } trill =\script { "trill" 0 0 1 0 2000 % be above text. } + +prall =\script { "prall" 0 0 1 0 0 } +mordent =\script { "mordent" 0 0 1 0 0 } +prallprall =\script { "prallprall" 0 0 1 0 0 } +prallmordent =\script { "prallmordent" 0 0 1 0 0 } +upprall =\script { "upprall" 0 0 1 0 0 } +downprall =\script { "downprall" 0 0 1 0 0 } diff --git a/input/Makefile.am b/input/Makefile.am index d1df230855..9e4b430c1f 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,6 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/input/Makefile.am.wild by bin/autowild -# Do not edit -# input/Makefile.am.wild +# Generated automatically by wild-perl 0.1# input/Makefile.am.wild LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex @@ -11,3 +9,5 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/input/Makefile.in b/input/Makefile.in index e0786fd3c1..588a8d7dc4 100644 --- a/input/Makefile.in +++ b/input/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./input/Makefile.am.wild by bin/autowild -# Do not edit -# input/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# input/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -149,25 +159,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -181,6 +192,9 @@ mostlyclean distclean maintainer-clean default: all $(OUTFILES) +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/input/denneboom.ly b/input/denneboom.ly index 98944aba31..b4aa56da13 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -10,163 +10,147 @@ TestedFeatures = "This file tests silly line shapes"; \version "0.1.9"; oden = \lyric{ - _8 O8 | - den-8. ne-16 boom,4 _8 o8 | - den-8. ne-16 boom.4. Wat8 zijn uw | - tak-4 ken won-8. der-16 schoon4 + O8 | + den-8. ne-16 boom,4. o8 | + den-8. ne-16 boom.4. Wat8 | + zijn uw tak-4 ken | + won-8. der-16 schoon4 _8 } ikheb = \lyric{ - _8 Ik8 heb u | - laatst4. in_'t8 bos8. zien16 staan4. toen8 zat- en | - er4. geen8 kaars-8. jes16 aan.4 + Ik8 | + heb u laatst4. in_'t8 | + bos8. zien16 staan4 _8 toen8 | + zat- en er4. geen8 | + kaars-8. jes16 aan.4 _8 } ugloeit = \lyric{ - _8 U8 gloeit in | - bar-4. re8 win-8. ter-16 tijd,4. als8 sneeuw op | - aar-4. de8 licht8. ge-16 spreid.4 + U8 | + gloeit in bar-4. re8 | + win-8. ter-16 tijd,4 r8 als8 | + sneeuw op aar-4. de8 | + licht8. ge-16 spreid.4 _8 } oboom = \melodic{ \octave c'; - r8 'g8 | - c8. c16 c4 r8 d8 | - e8. e16 e4 r8 e8 d e | - f4 'b d8. c16 c4 + 'g8 | + c8. c16 c4. d8 | + e8. e16 e4. e8 | + d e f4 'b | + d8. c16 c4 r8 } bos = \melodic{ \octave c'; - r8 g8 g e | - a4 r8 g8 g8. f16 f4 r8 f8 f d | - g4 r8 f8 f8. e16 e4 + g8 | + g e a4. g8 | + g8. f16 f4 r8 f8 | + f d g4. f8 | + f8. e16 e4 r8 } global = \melodic{ \meter 3/4; - \partial 4; - \skip 4*1; - \skip 4*3; - \meter 4/4; - \skip 4*4; - \meter 5/4; - \skip 4*5; - \meter 3/4; - \skip 4*3; - \meter 4/4; - \skip 4*4; - \meter 6/4; - \skip 4*6; - \skip 4*6; - \meter 5/4; - \skip 4*5; - \meter 3/4; - \skip 4*3; - \meter 4/4; - \skip 4*8; + \partial 8; + \skip 4*48; \bar "|."; } +melody = \melodic{ + \oboom + \oboom + \bos + \oboom +} + +$melody_staff = \type Staff = melody < + \global + \melody +> + +$verse_one = \melodic{ + \oden + \oden + \ikheb + \oden +} + +$verse_one_staff = \type Lyrics = one < + \global + \$verse_one +> + +$verse_two = \melodic{ + \oden + \oden + \ugloeit + \oden +} + +$verse_two_staff = \type Lyrics = two < + \global + \$verse_two +> + +$denneboom_shape = \paper{ + \paper_twenty + indent = 20. \mm; + \shape = 70. \mm 20. \mm + 65. \mm 30. \mm + 57.5 \mm 45. \mm + 50. \mm 60. \mm + 42.5 \mm 75. \mm + 35. \mm 90. \mm + 27.5 \mm 105. \mm + 20. \mm 120. \mm + 10. \mm 140. \mm + 65. \mm 30. \mm + ; + gourlay_maxmeasures = 30.; +% uhuh, loop if you comment these in +% arithmetic_basicspace = 3.8; +% arithmetic_multiplier = 8.\pt; +} \score{ < - \lyric \type Lyrics < - \multi 2 < -% huh? -% \global - { - \oden - \oden - \ikheb - \oden - } - > - > - \melodic \type Staff < - \multi 2 < - \global - { - \oboom - \oboom - \bos - \oboom - } - > - > + \$melody_staff + \$verse_one_staff > - \paper{ - \paper_twenty - indent = 20. \mm; - \shape = 70. \mm 20. \mm - 65. \mm 30. \mm - 57.5 \mm 45. \mm - 50. \mm 60. \mm - 42.5 \mm 75. \mm - 35. \mm 90. \mm - 27.5 \mm 105. \mm - 20. \mm 120. \mm - 10. \mm 140. \mm - 65. \mm 30. \mm - ; - gourlay_maxmeasures = 30.; + \paper{ +% huh? +% \$denneboom_shape + \paper_twenty + indent = 20. \mm; + \shape = 70. \mm 20. \mm + 65. \mm 30. \mm + 57.5 \mm 45. \mm + 50. \mm 60. \mm + 42.5 \mm 75. \mm + 35. \mm 90. \mm + 27.5 \mm 105. \mm + 20. \mm 120. \mm + 10. \mm 140. \mm +% 65. \mm 30. \mm + 65. \mm 40. \mm + ; + gourlay_maxmeasures = 30.; % uhuh, loop if you comment these in -% arithmetic_basicspace = 3.8; + arithmetic_basicspace = 3.8; % arithmetic_multiplier = 8.\pt; + arithmetic_multiplier = 7.5\pt; } - \midi{ - \tempo 4 = 90; - } + \midi{ \tempo 4 = 90; } } %{ \score{ < - \lyric \type Lyrics < - \multi 2 < -% huh? -% \global - { - \oden - \oden - \ugloeit - \oden - } - > - > - \melodic \type Staff < - \multi 2 < - \global - { - \oboom - \oboom - \bos - \oboom - } - > - > + \$melody_staff + \$verse_two_staff > - \paper{ - \paper_twenty - indent = 20. \mm; - \shape = 70. \mm 20. \mm - 65. \mm 30. \mm - 57.5 \mm 45. \mm - 50. \mm 60. \mm - 42.5 \mm 75. \mm - 35. \mm 90. \mm - 27.5 \mm 105. \mm - 20. \mm 120. \mm - 10. \mm 140. \mm -% 0. \mm 160. \mm - 65. \mm 30. \mm - ; - gourlay_maxmeasures = 30.; -% uhuh, loop if you comment these in -% arithmetic_basicspace = 3.8; -% arithmetic_multiplier = 8.\pt; - } - \midi{ - \tempo 4 = 90; - } + \paper{ \$denneboom_shape } + \midi{ \tempo 4 = 90; } } %} diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index 4e705aec23..2b05688939 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -158,7 +158,7 @@ fuga2_pedal = \melodic { % 19 } -break = \melodic { +breakmusic = \melodic { %\meter 4/4; r1 } @@ -169,12 +169,12 @@ break = \melodic { \type Score < \type Grandstaff < \type Staff = treble { - \praeludium_right \break \fuga2_right } + \praeludium_right \breakmusic \fuga2_right } \type Staff = bass { - \praeludium_left \break \fuga2_left } + \praeludium_left \breakmusic \fuga2_left } > \type Staff = pedal { - \praeludium_pedal \break \fuga2_pedal } + \praeludium_pedal \breakmusic \fuga2_pedal } > \paper{} diff --git a/lib/Makefile.am b/lib/Makefile.am index 3db06b1b22..dd6493aaa3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/lib/Makefile.am.wild by bin/autowild -# Do not edit +# Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for micro-lily-lib # file lib/Makefile @@ -11,14 +10,14 @@ SUBDIRS = include -lib_LIBRARIES = liblily.a -# lib_LIBRARIES = liblily.la +lib_LTLIBRARIES = liblily.la -EXTRA_DIST = Makefile.am.wild config.hh.in +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 MODULE_CXXFLAGS += -D_REENTRANT -liblily_a_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc - -INCLUDES = -Iinclude -I../flower/include +EXTRA_DIST = Makefile.am.wild config.hh.in +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/lib/Makefile.am.wild b/lib/Makefile.am.wild index a4a486cc81..90e461ccb1 100644 --- a/lib/Makefile.am.wild +++ b/lib/Makefile.am.wild @@ -9,14 +9,12 @@ SUBDIRS = include -lib_LIBRARIES = liblily.a -# lib_LIBRARIES = liblily.la +lib_LTLIBRARIES = liblily.la -EXTRA_DIST = Makefile.am.wild config.hh.in +liblily_la_SOURCES = $(wildcard *.cc) +INCLUDES = -Iinclude -I../flower/include MODULE_CXXFLAGS += -D_REENTRANT -liblily_a_SOURCES = $(wildcard *.cc) - -INCLUDES = -Iinclude -I../flower/include +EXTRA_DIST = Makefile.am.wild config.hh.in diff --git a/lib/Makefile.in b/lib/Makefile.in index 07200c8b05..9c1e1f6ced 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,11 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./lib/Makefile.am.wild by bin/autowild -# Do not edit +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for micro-lily-lib # file lib/Makefile @@ -54,12 +59,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -74,11 +81,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -94,44 +105,44 @@ ZIP = @ZIP@ SUBDIRS = include -lib_LIBRARIES = liblily.a -# lib_LIBRARIES = liblily.la - -EXTRA_DIST = Makefile.am.wild config.hh.in +lib_LTLIBRARIES = liblily.la -liblily_a_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc +liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc INCLUDES = -Iinclude -I../flower/include + +EXTRA_DIST = Makefile.am.wild config.hh.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.hh CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) -I. LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -liblily_a_LIBADD = -liblily_a_OBJECTS = binary-source-file.o duration-convert.o duration.o \ -includable-lexer.o input.o mapped-file-storage.o moment.o plet.o \ -simple-file-storage.o source-file.o source.o template.o warn.o \ -windhoos-suck-suck-suck-thank-you-cygnus.o -AR = ar +liblily_la_LDFLAGS = +liblily_la_LIBADD = +liblily_la_OBJECTS = binary-source-file.lo duration-convert.lo \ +duration.lo includable-lexer.lo input.lo mapped-file-storage.lo \ +moment.lo plet.lo simple-file-storage.lo source-file.lo source.lo \ +template.lo warn.lo windhoos-suck-suck-suck-thank-you-cygnus.lo CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in config.hh.in stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) GZIP = --best -SOURCES = $(liblily_a_SOURCES) -OBJECTS = $(liblily_a_OBJECTS) +SOURCES = $(liblily_la_SOURCES) +OBJECTS = $(liblily_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile @@ -141,6 +152,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status config.hh: stamp-h + @: stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=lib/config.hh:lib/config.hh.in \ @@ -156,61 +168,79 @@ mostlyclean-hdr: clean-hdr: distclean-hdr: - rm -f config.hh + -rm -f config.hh maintainer-clean-hdr: -mostlyclean-libLIBRARIES: +mostlyclean-libLTLIBRARIES: -clean-libLIBRARIES: - test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -distclean-libLIBRARIES: +distclean-libLTLIBRARIES: -maintainer-clean-libLIBRARIES: +maintainer-clean-libLTLIBRARIES: -install-libLIBRARIES: $(lib_LIBRARIES) +install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(libdir) - list='$(lib_LIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \ - $(INSTALL_DATA) $$p $(libdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(RANLIB) $(libdir)/$$p"; \ - $(RANLIB) $(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \ else :; fi; \ done -uninstall-libLIBRARIES: - $(NORMAL_UNINSTALL) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - rm -f $(libdir)/$$p; \ +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$$p; \ done .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: -liblily.a: $(liblily_a_OBJECTS) $(liblily_a_DEPENDENCIES) - rm -f liblily.a - $(AR) cru liblily.a $(liblily_a_OBJECTS) $(liblily_a_LIBADD) - $(RANLIB) liblily.a +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +liblily.la: $(liblily_la_OBJECTS) $(liblily_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(liblily_la_LDFLAGS) $(liblily_la_OBJECTS) $(liblily_la_LIBADD) $(LIBS) .cc.o: $(CXXCOMPILE) -c $< +.cc.lo: + $(LTCXXCOMPILE) -c $< # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -225,7 +255,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -235,7 +265,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -249,24 +281,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -281,15 +318,15 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -binary-source-file.o binary-source-file.lo: binary-source-file.cc \ +binary-source-file.lo binary-source-file.o: binary-source-file.cc \ include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -303,7 +340,7 @@ binary-source-file.o binary-source-file.lo: binary-source-file.cc \ ../flower/include/international.hh include/source-file.hh \ include/binary-source-file.hh \ ../flower/include/string-convert.hh -duration-convert.o duration-convert.lo: duration-convert.cc \ +duration-convert.lo duration-convert.o: duration-convert.cc \ include/duration-convert.hh include/duration.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/moment.hh ../flower/include/rational.hh \ @@ -312,7 +349,7 @@ duration-convert.o duration-convert.lo: duration-convert.cc \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh \ include/warn.hh -duration.o duration.lo: duration.cc include/proto.hh \ +duration.lo duration.o: duration.cc include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -327,7 +364,7 @@ duration.o duration.lo: duration.cc include/proto.hh \ ../flower/include/rational.hh include/duration.hh \ include/plet.hh include/duration-convert.hh \ ../flower/include/varray.hh -includable-lexer.o includable-lexer.lo: includable-lexer.cc \ +includable-lexer.lo includable-lexer.o: includable-lexer.cc \ include/includable-lexer.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -340,7 +377,7 @@ includable-lexer.o includable-lexer.lo: includable-lexer.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -input.o input.lo: input.cc include/proto.hh ../flower/include/fproto.hh \ +input.lo input.o: input.cc include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/input.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -352,18 +389,18 @@ input.o input.lo: input.cc include/proto.hh ../flower/include/fproto.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/source-file.hh -mapped-file-storage.o mapped-file-storage.lo: mapped-file-storage.cc -moment.o moment.lo: moment.cc ../flower/include/string.hh \ +mapped-file-storage.lo mapped-file-storage.o: mapped-file-storage.cc +moment.lo moment.o: moment.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/moment.hh ../flower/include/rational.hh -plet.o plet.lo: plet.cc include/plet.hh include/moment.hh \ +plet.lo plet.o: plet.cc include/plet.hh include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh -simple-file-storage.o simple-file-storage.lo: simple-file-storage.cc \ +simple-file-storage.lo simple-file-storage.o: simple-file-storage.cc \ include/simple-file-storage.hh include/file-storage.hh \ include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -372,7 +409,7 @@ simple-file-storage.o simple-file-storage.lo: simple-file-storage.cc \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/warn.hh -source-file.o source-file.lo: source-file.cc ../flower/include/string.hh \ +source-file.lo source-file.o: source-file.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -386,7 +423,7 @@ source-file.o source-file.lo: source-file.cc ../flower/include/string.hh \ include/windhoos-suck-suck-suck-thank-you-cygnus.hh \ include/source-file.hh include/simple-file-storage.hh \ include/file-storage.hh -source.o source.lo: source.cc include/binary-source-file.hh \ +source.lo source.o: source.cc include/binary-source-file.hh \ include/source-file.hh include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ @@ -400,7 +437,7 @@ source.o source.lo: source.cc include/binary-source-file.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/source.hh ../flower/include/path.hh \ ../flower/include/varray.hh -template.o template.lo: template.cc include/source-file.hh \ +template.lo template.o: template.cc include/source-file.hh \ include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -413,12 +450,12 @@ template.o template.lo: template.cc include/source-file.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc ../flower/include/pcursor.tcc \ ../flower/include/cursor.tcc ../flower/include/list.tcc -warn.o warn.lo: warn.cc include/warn.hh ../flower/include/string.hh \ +warn.lo warn.o: warn.cc include/warn.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -windhoos-suck-suck-suck-thank-you-cygnus.o windhoos-suck-suck-suck-thank-you-cygnus.lo: \ +windhoos-suck-suck-suck-thank-you-cygnus.lo windhoos-suck-suck-suck-thank-you-cygnus.o: \ windhoos-suck-suck-suck-thank-you-cygnus.cc info: info-recursive @@ -429,11 +466,11 @@ installcheck: installcheck-recursive all-recursive-am: config.hh $(MAKE) all-recursive -all-am: Makefile $(LIBRARIES) config.hh +all-am: Makefile $(LTLIBRARIES) config.hh -install-exec-am: install-libLIBRARIES +install-exec-am: install-libLTLIBRARIES -uninstall-am: uninstall-libLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES install-exec: install-exec-recursive install-exec-am @$(NORMAL_INSTALL) @@ -455,50 +492,56 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-hdr mostlyclean-libLIBRARIES \ - mostlyclean-compile mostlyclean-tags \ - mostlyclean-generic + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-tags mostlyclean-generic -clean-am: clean-hdr clean-libLIBRARIES clean-compile clean-tags \ - clean-generic mostlyclean-am +clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am -distclean-am: distclean-hdr distclean-libLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am +distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-tags distclean-generic \ + clean-am -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-generic \ + distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ -maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \ -clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ -install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ +maintainer-clean-hdr mostlyclean-libLTLIBRARIES \ +distclean-libLTLIBRARIES clean-libLTLIBRARIES \ +maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \ +install-libLTLIBRARIES mostlyclean-compile distclean-compile \ +clean-compile maintainer-clean-compile mostlyclean-libtool \ +distclean-libtool clean-libtool maintainer-clean-libtool \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ @@ -509,9 +552,11 @@ install-exec install-data install uninstall all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean - MODULE_CXXFLAGS += -D_REENTRANT +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am index 4e1e02f8bb..f13c29905a 100644 --- a/lib/include/Makefile.am +++ b/lib/include/Makefile.am @@ -1,8 +1,8 @@ -# Automatically generated from ./lilypond-0.1.49/lib/include/Makefile.am.wild by bin/autowild -# Do not edit -# lib/include/Makefile +# 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 +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in index c933326bc1..f6294abc31 100644 --- a/lib/include/Makefile.in +++ b/lib/include/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./lib/include/Makefile.am.wild by bin/autowild -# Do not edit -# lib/include/Makefile +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# lib/include/Makefile SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -112,21 +122,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -165,25 +180,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean @@ -197,6 +213,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/simple-file-storage.cc b/lib/simple-file-storage.cc index e7c9240b00..a8e98aaeb8 100644 --- a/lib/simple-file-storage.cc +++ b/lib/simple-file-storage.cc @@ -8,6 +8,10 @@ #include +#ifndef SEEK_END +#define SEEK_END 2 +#endif + #include "simple-file-storage.hh" #include "varray.hh" #include "string.hh" diff --git a/lily/Makefile.am b/lily/Makefile.am index 4a4a0ca225..b069632500 100644 --- a/lily/Makefile.am +++ b/lily/Makefile.am @@ -1,5 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/lily/Makefile.am.wild by bin/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 # @@ -15,14 +14,14 @@ bin_PROGRAMS = lilypond # ignoring wildcards for `lexer.cc' # ignoring wildcards for `parser.cc' -lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy +lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy noinst_HEADERS = parser.hh lilypond_LDADD = -llily -lflower @LEXLIB@ -lilypond_LDFLAGS = -L../lib -L../flower +lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs -INCLUDES = -I. -Iinclude -I../lib/include -I../flower/include +INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild Stable.make VERSION @@ -51,3 +50,5 @@ parser.hh: parser.yy # # could be faster: # # $(FLEX) -8 -Cf -t $< > $@ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/lily/Makefile.am.wild b/lily/Makefile.am.wild index cfee24cd3d..10a242b8df 100644 --- a/lily/Makefile.am.wild +++ b/lily/Makefile.am.wild @@ -17,9 +17,9 @@ noinst_HEADERS = parser.hh lilypond_LDADD = -llily -lflower @LEXLIB@ -lilypond_LDFLAGS = -L../lib -L../flower +lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs -INCLUDES = -I. -Iinclude -I../lib/include -I../flower/include +INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild Stable.make VERSION diff --git a/lily/Makefile.in b/lily/Makefile.in index 9bec8d02f8..adc2cd8229 100644 --- a/lily/Makefile.in +++ b/lily/Makefile.in @@ -1,11 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./lily/Makefile.am.wild by bin/autowild -# Do not edit +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for lilypond # file lily/Makefile.am.wild # @@ -53,12 +58,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -73,11 +80,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -95,14 +106,17 @@ SUBDIRS = include bin_PROGRAMS = lilypond -lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy +# ignoring wildcards for `lexer.cc' +# ignoring wildcards for `parser.cc' + +lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy noinst_HEADERS = parser.hh lilypond_LDADD = -llily -lflower @LEXLIB@ -lilypond_LDFLAGS = -L../lib -L../flower +lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs -INCLUDES = -I. -Iinclude -I../lib/include -I../flower/include +INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild Stable.make VERSION mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -130,15 +144,15 @@ horizontal-align-item.o horizontal-group-item.o \ horizontal-vertical-group-item.o idealspacing.o identifier.o \ ineq-constrained-qp.o item.o key-grav.o key-item.o key-performer.o \ key.o keyword.o leastsquares.o lexerinit.o lily-version.o \ -line-group-grav.o line-spacer.o local-key-grav.o local-key-item.o \ -lookup.o lyric-grav.o lyric-performer.o main.o meter-grav.o \ -meter-performer.o meter.o midi-def.o midi-item.o midi-stream.o \ -midi-walker.o misc.o molecule.o music-iterator.o music-list.o \ -music-output-def.o music.o musical-request.o my-lily-lexer.o \ -my-lily-parser.o note-column.o note-head.o note-performer.o note.o \ -notename-table.o offset.o outputter.o p-col.o p-score.o paper-def.o \ -performance.o performer-group-performer.o performer.o \ -pitch-squash-grav.o plet-engraver.o plet-spanner.o \ +line-group-grav.o line-spacer.o linear-programming.o local-key-grav.o \ +local-key-item.o lookup.o lyric-grav.o lyric-performer.o main.o \ +meter-grav.o meter-performer.o meter.o midi-def.o midi-item.o \ +midi-stream.o midi-walker.o misc.o molecule.o music-iterator.o \ +music-list.o music-output-def.o music.o musical-request.o \ +my-lily-lexer.o my-lily-parser.o note-column.o note-head.o \ +note-performer.o note.o notename-table.o offset.o outputter.o p-col.o \ +p-score.o paper-def.o performance.o performer-group-performer.o \ +performer.o pitch-squash-grav.o plet-engraver.o plet-spanner.o \ plet-swallow-engraver.o priority-halign-grav.o property-iterator.o \ ps-plet.o qlp.o qlpsolve.o request-iterator.o request.o \ rest-collision-grav.o rest-collision.o rest-grav.o rest.o \ @@ -162,7 +176,12 @@ lilypond_DEPENDENCIES = LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEXLIB = @LEXLIB@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) DIST_COMMON = Makefile.am Makefile.in lexer.cc parser.cc @@ -177,7 +196,7 @@ OBJECTS = $(lilypond_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .h .ll .o .yy +.SUFFIXES: .S .c .cc .ll .lo .o .s .yy $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lily/Makefile @@ -189,7 +208,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -200,13 +219,13 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -214,33 +233,57 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + lilypond: $(lilypond_OBJECTS) $(lilypond_DEPENDENCIES) @rm -f lilypond $(CXXLINK) $(lilypond_LDFLAGS) $(lilypond_OBJECTS) $(lilypond_LDADD) $(LIBS) .yy.cc: - $(YACC) $(YFLAGS) $< && mv y.tab.c $@ - if test -f y.tab.h; then \ - if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \ - else :; fi -.yy.h: - $(YACC) $(YFLAGS) $< && mv y.tab.c $@ + $(YACC) $(YFLAGS) $< && mv y.tab.c $*.cc if test -f y.tab.h; then \ if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \ else :; fi +parser.hh: parser.cc + .ll.cc: $(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@ .cc.o: $(CXXCOMPILE) -c $< +.cc.lo: + $(LTCXXCOMPILE) -c $< # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -255,7 +298,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -265,7 +308,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -279,24 +324,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -311,19 +361,18 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -abbrev.o abbrev.lo: abbrev.cc include/abbrev.hh include/item.hh \ - include/boxes.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/interval.hh \ - ../flower/include/compare.hh include/offset.hh include/axes.hh \ - ../flower/include/string.hh \ +abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -346,8 +395,7 @@ abbrev.o abbrev.lo: abbrev.cc include/abbrev.hh include/item.hh \ ../flower/include/assoc.hh include/lookup.hh include/atom.hh \ ../flower/include/scalar.hh include/stem.hh include/molecule.hh \ include/dimen.hh -abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \ - abbreviation-beam-engraver.cc \ +abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \ ../lib/include/duration-convert.hh ../lib/include/duration.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -377,10 +425,10 @@ abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \ include/abbreviation-beam.hh include/beam.hh \ include/directional-spanner.hh include/spanner.hh \ include/musical-request.hh include/misc.hh include/grouping.hh -abbreviation-beam.o abbreviation-beam.lo: abbreviation-beam.cc \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \ + include/horizontal-group-item.hh include/elem-group.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -410,7 +458,7 @@ abbreviation-beam.o abbreviation-beam.lo: abbreviation-beam.cc \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/lookup.hh \ include/stem-info.hh -atom.o atom.lo: atom.cc include/atom.hh ../flower/include/string.hh \ +atom.o: atom.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -421,7 +469,7 @@ atom.o atom.lo: atom.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/scalar.hh include/dimen.hh \ ../flower/include/varray.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -audio-column.o audio-column.lo: audio-column.cc include/audio-column.hh \ +audio-column.o: audio-column.cc include/audio-column.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -437,17 +485,16 @@ audio-column.o audio-column.lo: audio-column.cc include/audio-column.hh \ ../flower/include/virtual-methods.hh include/performance.hh \ include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -audio-element.o audio-element.lo: audio-element.cc \ - include/audio-element.hh ../flower/include/virtual-methods.hh \ - include/debug.hh ../flower/include/dstream.hh \ - ../flower/include/string.hh \ +audio-element.o: audio-element.cc include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh -audio-item.o audio-item.lo: audio-item.cc include/debug.hh \ +audio-item.o: audio-item.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -466,7 +513,7 @@ audio-item.o audio-item.lo: audio-item.cc include/debug.hh \ ../lib/include/input.hh include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ include/audio-column.hh -audio-staff.o audio-staff.lo: audio-staff.cc include/audio-staff.hh \ +audio-staff.o: audio-staff.cc include/audio-staff.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -483,10 +530,9 @@ audio-staff.o audio-staff.lo: audio-staff.cc include/audio-staff.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/midi-stream.hh include/midi-walker.hh \ ../flower/include/pqueue.hh ../flower/include/varray.hh -axis-group-administration.o axis-group-administration.lo: \ - axis-group-administration.cc ../flower/include/interval.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/compare.hh \ +axis-group-administration.o: axis-group-administration.cc \ + ../flower/include/interval.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/compare.hh \ include/axis-group-administration.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ include/axes.hh ../flower/include/string.hh \ @@ -498,7 +544,7 @@ axis-group-administration.o axis-group-administration.lo: \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -axis-group-element.o axis-group-element.lo: axis-group-element.cc \ +axis-group-element.o: axis-group-element.cc \ include/axis-group-element.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -512,10 +558,9 @@ axis-group-element.o axis-group-element.lo: axis-group-element.cc \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/interval.hh \ include/axis-group-administration.hh -axis-group-item.o axis-group-item.lo: axis-group-item.cc \ - include/axis-group-item.hh include/axis-group-element.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +axis-group-item.o: axis-group-item.cc include/axis-group-item.hh \ + include/axis-group-element.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -535,7 +580,7 @@ axis-group-item.o axis-group-item.lo: axis-group-item.cc \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -axis-group-spanner.o axis-group-spanner.lo: axis-group-spanner.cc \ +axis-group-spanner.o: axis-group-spanner.cc \ include/axis-group-spanner.hh include/spanner.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -559,17 +604,16 @@ axis-group-spanner.o axis-group-spanner.lo: axis-group-spanner.cc \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -axis.o axis.lo: axis.cc include/axes.hh ../flower/include/string.hh \ +axis.o: axis.cc include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -bar-column-grav.o bar-column-grav.lo: bar-column-grav.cc \ - include/bar-column-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +bar-column-grav.o: bar-column-grav.cc include/bar-column-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -589,7 +633,7 @@ bar-column-grav.o bar-column-grav.lo: bar-column-grav.cc \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/elem-group.hh \ include/script.hh include/staff-side.hh include/bar.hh -bar-column.o bar-column.lo: bar-column.cc include/bar.hh include/item.hh \ +bar-column.o: bar-column.cc include/bar.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ @@ -607,11 +651,11 @@ bar-column.o bar-column.lo: bar-column.cc include/bar.hh include/item.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/elem-group.hh -bar-grav.o bar-grav.lo: bar-grav.cc include/bar-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -634,12 +678,11 @@ bar-grav.o bar-grav.lo: bar-grav.cc include/bar-grav.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/translator-group.hh -bar-number-grav.o bar-number-grav.lo: bar-number-grav.cc \ - include/bar-number-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +bar-number-grav.o: bar-number-grav.cc include/bar-number-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -659,7 +702,7 @@ bar-number-grav.o bar-number-grav.lo: bar-number-grav.cc \ include/command-request.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/bar.hh \ include/time-description.hh -bar.o bar.lo: bar.cc include/bar.hh include/item.hh include/boxes.hh \ +bar.o: bar.cc include/bar.hh include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -683,11 +726,10 @@ bar.o bar.lo: bar.cc include/bar.hh include/item.hh include/boxes.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -beam-grav.o beam-grav.lo: beam-grav.cc \ - ../lib/include/duration-convert.hh ../lib/include/duration.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +beam-grav.o: beam-grav.cc ../lib/include/duration-convert.hh \ + ../lib/include/duration.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh \ @@ -716,7 +758,7 @@ beam-grav.o beam-grav.lo: beam-grav.cc \ include/horizontal-group-item.hh include/elem-group.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh -beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \ +beam-swallow-trans.o: beam-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -733,10 +775,9 @@ beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -beam.o beam.lo: beam.cc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ + include/elem-group.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -766,7 +807,7 @@ beam.o beam.lo: beam.cc include/p-col.hh \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/lookup.hh \ include/stem-info.hh include/main.hh -bow.o bow.lo: bow.cc include/bow.hh include/directional-spanner.hh \ +bow.o: bow.cc include/bow.hh include/directional-spanner.hh \ include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score-elem.hh \ @@ -789,17 +830,17 @@ bow.o bow.lo: bow.cc include/bow.hh include/directional-spanner.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/molecule.hh include/boxes.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh -boxes.o boxes.lo: boxes.cc include/boxes.hh ../flower/include/fproto.hh \ +boxes.o: boxes.cc include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh -break-align-item.o break-align-item.lo: break-align-item.cc \ - include/break-align-item.hh include/horizontal-align-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +break-align-item.o: break-align-item.cc include/break-align-item.hh \ + include/horizontal-align-item.hh include/elem-group.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -812,7 +853,7 @@ break-align-item.o break-align-item.lo: break-align-item.cc \ ../flower/include/interval.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/item.hh \ include/boxes.hh include/drul-array.hh include/direction.hh -break.o break.lo: break.cc include/score-column.hh include/lily-proto.hh \ +break.o: break.cc include/score-column.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -841,17 +882,17 @@ break.o break.lo: break.cc include/score-column.hh include/lily-proto.hh \ ../lib/include/warn.hh include/scoreline.hh include/spanner.hh \ include/p-score.hh include/music-output.hh \ ../flower/include/cpu-timer.hh -change-iterator.o change-iterator.lo: change-iterator.cc \ - include/change-iterator.hh include/music-iterator.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/varray.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +change-iterator.o: change-iterator.cc include/change-iterator.hh \ + include/music-iterator.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/virtual-methods.hh \ include/translator-group.hh ../flower/include/string.hh \ @@ -863,19 +904,19 @@ change-iterator.o change-iterator.lo: change-iterator.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -change-translator.o change-translator.lo: change-translator.cc \ - include/change-translator.hh include/music.hh \ - ../flower/include/virtual-methods.hh ../lib/include/input.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/minterval.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +change-translator.o: change-translator.cc include/change-translator.hh \ + include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -chord-iterator.o chord-iterator.lo: chord-iterator.cc \ - include/translator-group.hh ../flower/include/string.hh \ +chord-iterator.o: chord-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -896,7 +937,7 @@ chord-iterator.o chord-iterator.lo: chord-iterator.cc \ ../flower/include/rational.hh include/music-list.hh \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh -clef-grav.o clef-grav.lo: clef-grav.cc include/bar.hh include/item.hh \ +clef-grav.o: clef-grav.cc include/bar.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ @@ -921,8 +962,8 @@ clef-grav.o clef-grav.lo: clef-grav.cc include/bar.hh include/item.hh \ ../lib/include/warn.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/time-description.hh -clef-item.o clef-item.lo: clef-item.cc include/clef-item.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +clef-item.o: clef-item.cc include/clef-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -948,7 +989,7 @@ clef-item.o clef-item.lo: clef-item.cc include/clef-item.hh \ ../lib/include/input.hh include/music.hh include/minterval.hh \ include/score-elem-info.hh include/staff-info.hh \ include/translator.hh -col-info.o col-info.lo: col-info.cc include/p-col.hh \ +col-info.o: col-info.cc include/p-col.hh \ include/horizontal-group-item.hh include/elem-group.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -972,21 +1013,21 @@ col-info.o col-info.lo: col-info.cc include/p-col.hh \ ../flower/include/plist.icc include/col-info.hh \ ../flower/include/pointer.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -colhpos.o colhpos.lo: colhpos.cc include/colhpos.hh \ - ../flower/include/varray.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +colhpos.o: colhpos.cc include/colhpos.hh ../flower/include/varray.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../lib/include/warn.hh ../flower/include/vector.hh \ include/line-spacer.hh ../flower/include/interval.hh -collision-grav.o collision-grav.lo: collision-grav.cc \ - include/note-column.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +collision-grav.o: collision-grav.cc include/note-column.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -1007,8 +1048,8 @@ collision-grav.o collision-grav.lo: collision-grav.cc \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/collision.hh -collision.o collision.lo: collision.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1036,9 +1077,8 @@ collision.o collision.lo: collision.cc include/debug.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh -command-request.o command-request.lo: command-request.cc \ - include/command-request.hh include/request.hh \ - ../flower/include/string.hh \ +command-request.o: command-request.cc include/command-request.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1051,17 +1091,16 @@ command-request.o command-request.lo: command-request.cc \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh include/musical-request.hh -crescendo.o crescendo.lo: crescendo.cc include/molecule.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/boxes.hh \ - ../flower/include/interval.hh include/offset.hh include/axes.hh \ - ../flower/include/string.hh \ +crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/direction.hh \ @@ -1082,7 +1121,7 @@ crescendo.o crescendo.lo: crescendo.cc include/molecule.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh -debug.o debug.lo: debug.cc include/debug.hh ../flower/include/dstream.hh \ +debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1092,7 +1131,7 @@ debug.o debug.lo: debug.cc include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh ../flower/include/flower-debug.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/main.hh -dimen.o dimen.lo: dimen.cc include/dimen.hh ../flower/include/real.hh \ +dimen.o: dimen.cc include/dimen.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -1100,7 +1139,7 @@ dimen.o dimen.lo: dimen.cc include/dimen.hh ../flower/include/real.hh \ include/debug.hh ../flower/include/dstream.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh -directional-spanner.o directional-spanner.lo: directional-spanner.cc \ +directional-spanner.o: directional-spanner.cc \ include/directional-spanner.hh include/spanner.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1115,9 +1154,9 @@ directional-spanner.o directional-spanner.lo: directional-spanner.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ include/direction.hh -dot-column-grav.o dot-column-grav.lo: dot-column-grav.cc -dot-column.o dot-column.lo: dot-column.cc include/dots.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +dot-column-grav.o: dot-column-grav.cc +dot-column.o: dot-column.cc include/dots.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -1134,7 +1173,7 @@ dot-column.o dot-column.lo: dot-column.cc include/dots.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/rhythmic-head.hh -dots.o dots.lo: dots.cc include/dots.hh include/item.hh include/boxes.hh \ +dots.o: dots.cc include/dots.hh include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -1156,7 +1195,7 @@ dots.o dots.lo: dots.cc include/dots.hh include/item.hh include/boxes.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh -dynamic-grav.o dynamic-grav.lo: dynamic-grav.cc include/debug.hh \ +dynamic-grav.o: dynamic-grav.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1193,9 +1232,8 @@ dynamic-grav.o dynamic-grav.lo: dynamic-grav.cc include/debug.hh \ include/staff-sym.hh include/note-column.hh \ include/script-column.hh \ include/horizontal-vertical-group-item.hh -elem-group.o elem-group.lo: elem-group.cc include/elem-group.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +elem-group.o: elem-group.cc include/elem-group.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -1210,18 +1248,17 @@ elem-group.o elem-group.lo: elem-group.cc include/elem-group.hh \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -engraver-group.o engraver-group.lo: engraver-group.cc \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/engraver-group.hh include/lily-proto.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - include/score-elem-info.hh ../flower/include/scalar.hh \ - ../flower/include/string.hh \ +engraver-group.o: engraver-group.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/engraver-group.hh \ + include/lily-proto.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh include/score-elem-info.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/engraver.hh \ @@ -1237,13 +1274,12 @@ engraver-group.o engraver-group.lo: engraver-group.cc \ include/p-score.hh include/colhpos.hh include/music-output.hh \ include/score-elem.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh -engraver.o engraver.lo: engraver.cc include/music-list.hh \ - include/music.hh ../flower/include/virtual-methods.hh \ - ../lib/include/input.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/minterval.hh ../flower/include/interval.hh \ - ../flower/include/compare.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh \ +engraver.o: engraver.cc include/music-list.hh include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/plist.hh \ @@ -1261,7 +1297,7 @@ engraver.o engraver.lo: engraver.cc include/music-list.hh \ ../flower/include/parray.hh include/engraver-group.hh \ include/translator-group.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -general-script-def.o general-script-def.lo: general-script-def.cc \ +general-script-def.o: general-script-def.cc \ include/general-script-def.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../lib/include/input.hh \ @@ -1273,9 +1309,8 @@ general-script-def.o general-script-def.lo: general-script-def.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ ../lib/include/warn.hh include/atom.hh include/boxes.hh \ ../flower/include/interval.hh include/offset.hh include/axes.hh -global-translator.o global-translator.lo: global-translator.cc \ - include/global-translator.hh include/translator-group.hh \ - ../flower/include/string.hh \ +global-translator.o: global-translator.cc include/global-translator.hh \ + include/translator-group.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1291,21 +1326,20 @@ global-translator.o global-translator.lo: global-translator.cc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/rational.hh ../flower/include/pqueue.hh -gourlay-breaking.o gourlay-breaking.lo: gourlay-breaking.cc \ - include/gourlay-breaking.hh include/break.hh \ - ../flower/include/varray.hh ../flower/include/interval.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/compare.hh include/lily-proto.hh \ - ../lib/include/proto.hh include/colhpos.hh \ - include/spring-spacer.hh include/line-spacer.hh \ - ../flower/include/vector.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/col-info.hh \ - ../flower/include/pointer.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh \ +gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.hh \ + include/break.hh ../flower/include/varray.hh \ + ../flower/include/interval.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + include/colhpos.hh include/spring-spacer.hh \ + include/line-spacer.hh ../flower/include/vector.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/col-info.hh ../flower/include/pointer.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -1322,9 +1356,8 @@ gourlay-breaking.o gourlay-breaking.lo: gourlay-breaking.cc \ include/direction.hh include/p-score.hh include/music-output.hh \ include/paper-def.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh -graphical-element.o graphical-element.lo: graphical-element.cc \ - include/graphical-element.hh include/offset.hh \ - ../flower/include/real.hh include/axes.hh \ +graphical-element.o: graphical-element.cc include/graphical-element.hh \ + include/offset.hh ../flower/include/real.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -1337,8 +1370,8 @@ graphical-element.o graphical-element.lo: graphical-element.cc \ ../flower/include/directed-graph.hh \ include/axis-group-administration.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -grouping.o grouping.lo: grouping.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +grouping.o: grouping.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1347,11 +1380,11 @@ grouping.o grouping.lo: grouping.cc include/debug.hh \ ../lib/include/warn.hh include/grouping.hh include/minterval.hh \ ../flower/include/interval.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/varray.hh -head-grav.o head-grav.lo: head-grav.cc include/note-head.hh \ - include/rhythmic-head.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +head-grav.o: head-grav.cc include/note-head.hh include/rhythmic-head.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -1375,7 +1408,7 @@ head-grav.o head-grav.lo: head-grav.cc include/note-head.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/musical-request.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/dots.hh -header.o header.lo: header.cc ../flower/include/string.hh \ +header.o: header.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1384,10 +1417,10 @@ header.o header.lo: header.cc ../flower/include/string.hh \ ../flower/include/assoc-iter.hh ../flower/include/assoc.hh \ ../flower/include/varray.hh ../flower/include/dictionary.hh \ include/header.hh -horizontal-align-item.o horizontal-align-item.lo: \ - horizontal-align-item.cc include/horizontal-align-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +horizontal-align-item.o: horizontal-align-item.cc \ + include/horizontal-align-item.hh include/elem-group.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -1402,8 +1435,7 @@ horizontal-align-item.o horizontal-align-item.lo: \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -horizontal-group-item.o horizontal-group-item.lo: \ - horizontal-group-item.cc include/p-col.hh \ +horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \ include/horizontal-group-item.hh include/elem-group.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -1425,8 +1457,7 @@ horizontal-group-item.o horizontal-group-item.lo: \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \ - horizontal-vertical-group-item.cc \ +horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -1450,7 +1481,7 @@ horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -idealspacing.o idealspacing.lo: idealspacing.cc include/idealspacing.hh \ +idealspacing.o: idealspacing.cc include/idealspacing.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/p-col.hh include/horizontal-group-item.hh \ @@ -1474,10 +1505,9 @@ idealspacing.o idealspacing.lo: idealspacing.cc include/idealspacing.hh \ ../flower/include/plist.icc include/p-score.hh \ include/colhpos.hh include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -identifier.o identifier.lo: identifier.cc include/midi-def.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/string.hh \ +identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1502,7 +1532,7 @@ identifier.o identifier.lo: identifier.cc include/midi-def.hh \ include/direction.hh include/script-def.hh \ include/general-script-def.hh include/request.hh \ include/music.hh include/minterval.hh include/translator.hh -ineq-constrained-qp.o ineq-constrained-qp.lo: ineq-constrained-qp.cc \ +ineq-constrained-qp.o: ineq-constrained-qp.cc \ include/ineq-constrained-qp.hh ../flower/include/matrix.hh \ ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ ../flower/include/real.hh ../flower/include/virtual-methods.hh \ @@ -1514,7 +1544,7 @@ ineq-constrained-qp.o ineq-constrained-qp.lo: ineq-constrained-qp.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh ../flower/include/choleski.hh -item.o item.lo: item.cc include/p-score.hh include/colhpos.hh \ +item.o: item.cc include/p-score.hh include/colhpos.hh \ ../flower/include/varray.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/parray.hh \ @@ -1539,11 +1569,11 @@ item.o item.lo: item.cc include/p-score.hh include/colhpos.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/spanner.hh -key-grav.o key-grav.lo: key-grav.cc include/key-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +key-grav.o: key-grav.cc include/key-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1563,7 +1593,7 @@ key-grav.o key-grav.lo: key-grav.cc include/key-grav.hh \ ../lib/include/plet.hh include/local-key-grav.hh \ include/musical-request.hh include/local-key-item.hh \ include/bar.hh include/time-description.hh -key-item.o key-item.lo: key-item.cc include/key-item.hh include/item.hh \ +key-item.o: key-item.cc include/key-item.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ @@ -1592,12 +1622,11 @@ key-item.o key-item.lo: key-item.cc include/key-item.hh include/item.hh \ include/music.hh include/minterval.hh \ include/score-elem-info.hh include/staff-info.hh \ include/translator.hh -key-performer.o key-performer.lo: key-performer.cc \ - include/key-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/performer.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +key-performer.o: key-performer.cc include/key-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1611,21 +1640,21 @@ key-performer.o key-performer.lo: key-performer.cc \ ../flower/include/parray.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh -key.o key.lo: key.cc include/key.hh ../flower/include/varray.hh \ +key.o: key.cc include/key.hh ../flower/include/varray.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -keyword.o keyword.lo: keyword.cc include/keyword.hh -leastsquares.o leastsquares.lo: leastsquares.cc include/leastsquares.hh \ +keyword.o: keyword.cc include/keyword.hh +leastsquares.o: leastsquares.cc include/leastsquares.hh \ ../flower/include/varray.hh include/offset.hh \ ../flower/include/real.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \ +lexer.o: lexer.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1639,7 +1668,7 @@ lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/parseconstruct.hh include/main.hh include/identifier.hh \ ../lib/include/input.hh ../flower/include/virtual-methods.hh -lexerinit.o lexerinit.lo: lexerinit.cc ../lib/include/proto.hh \ +lexerinit.o: lexerinit.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -1658,9 +1687,9 @@ lexerinit.o lexerinit.lo: lexerinit.cc ../lib/include/proto.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/main.hh ../lib/include/source-file.hh \ ../lib/include/source.hh -lily-version.o lily-version.lo: lily-version.cc ../lib/config.hh -line-group-grav.o line-group-grav.lo: line-group-grav.cc \ - include/staff-sym.hh include/spanner.hh include/lily-proto.hh \ +lily-version.o: lily-version.cc ../lib/config.hh +line-group-grav.o: line-group-grav.cc include/staff-sym.hh \ + include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ @@ -1692,16 +1721,16 @@ line-group-grav.o line-group-grav.lo: line-group-grav.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -line-spacer.o line-spacer.lo: line-spacer.cc include/line-spacer.hh \ +line-spacer.o: line-spacer.cc include/line-spacer.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/varray.hh ../flower/include/vector.hh \ ../flower/include/interval.hh ../flower/include/compare.hh -local-key-grav.o local-key-grav.lo: local-key-grav.cc \ - include/musical-request.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/request.hh \ - ../flower/include/string.hh \ +linear-programming.o: linear-programming.cc +local-key-grav.o: local-key-grav.cc include/musical-request.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1726,7 +1755,7 @@ local-key-grav.o local-key-grav.lo: local-key-grav.cc \ include/directional-spanner.hh include/spanner.hh \ include/note-head.hh include/rhythmic-head.hh \ include/time-description.hh -local-key-item.o local-key-item.lo: local-key-item.cc include/dimen.hh \ +local-key-item.o: local-key-item.cc include/dimen.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -1754,7 +1783,7 @@ local-key-item.o local-key-item.lo: local-key-item.cc include/dimen.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/note-head.hh include/rhythmic-head.hh include/misc.hh \ include/grouping.hh -lookup.o lookup.lo: lookup.cc include/lookup.hh include/atom.hh \ +lookup.o: lookup.cc include/lookup.hh include/atom.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1776,7 +1805,7 @@ lookup.o lookup.lo: lookup.cc include/lookup.hh include/atom.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/main.hh -lyric-grav.o lyric-grav.lo: lyric-grav.cc include/lyric-engraver.hh \ +lyric-grav.o: lyric-grav.cc include/lyric-engraver.hh \ include/engraver.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -1805,12 +1834,11 @@ lyric-grav.o lyric-grav.lo: lyric-grav.cc include/lyric-engraver.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/lookup.hh include/atom.hh -lyric-performer.o lyric-performer.lo: lyric-performer.cc \ - include/lyric-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/performer.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +lyric-performer.o: lyric-performer.cc include/lyric-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1825,15 +1853,15 @@ lyric-performer.o lyric-performer.lo: lyric-performer.cc \ include/general-script-def.hh include/musical-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh -main.o main.lo: main.cc ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/lgetopt.hh \ - include/misc.hh include/lily-proto.hh ../lib/include/moment.hh \ +main.o: main.cc ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/lgetopt.hh include/misc.hh \ + include/lily-proto.hh ../lib/include/moment.hh \ ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ @@ -1846,11 +1874,11 @@ main.o main.lo: main.cc ../lib/include/proto.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/my-lily-parser.hh ../lib/include/duration.hh \ ../lib/include/plet.hh ../lib/include/input.hh -meter-grav.o meter-grav.lo: meter-grav.cc include/meter-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +meter-grav.o: meter-grav.cc include/meter-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1875,12 +1903,11 @@ meter-grav.o meter-grav.lo: meter-grav.cc include/meter-grav.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/translator-group.hh -meter-performer.o meter-performer.lo: meter-performer.cc \ - include/meter-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/performer.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +meter-performer.o: meter-performer.cc include/meter-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1894,7 +1921,7 @@ meter-performer.o meter-performer.lo: meter-performer.cc \ ../flower/include/parray.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh -meter.o meter.lo: meter.cc ../flower/include/scalar.hh \ +meter.o: meter.cc ../flower/include/scalar.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1918,11 +1945,10 @@ meter.o meter.lo: meter.cc ../flower/include/scalar.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh include/atom.hh -midi-def.o midi-def.lo: midi-def.cc include/misc.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +midi-def.o: midi-def.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -1946,7 +1972,7 @@ midi-def.o midi-def.lo: midi-def.cc include/misc.hh \ include/translator-group.hh include/global-translator.hh \ ../flower/include/pqueue.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -midi-item.o midi-item.lo: midi-item.cc ../lib/include/proto.hh \ +midi-item.o: midi-item.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -1969,7 +1995,7 @@ midi-item.o midi-item.lo: midi-item.cc ../lib/include/proto.hh \ include/musical-request.hh include/midi-item.hh \ include/midi-stream.hh include/audio-item.hh \ include/audio-element.hh -midi-stream.o midi-stream.lo: midi-stream.cc ../flower/include/string.hh \ +midi-stream.o: midi-stream.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1988,7 +2014,7 @@ midi-stream.o midi-stream.lo: midi-stream.cc ../flower/include/string.hh \ ../flower/include/virtual-methods.hh include/midi-stream.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -midi-walker.o midi-walker.lo: midi-walker.cc include/midi-walker.hh \ +midi-walker.o: midi-walker.cc include/midi-walker.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -2006,7 +2032,7 @@ midi-walker.o midi-walker.lo: midi-walker.cc include/midi-walker.hh \ ../flower/include/virtual-methods.hh include/audio-staff.hh \ include/midi-item.hh include/midi-stream.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -misc.o misc.lo: misc.cc include/item.hh include/boxes.hh \ +misc.o: misc.cc include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -2021,7 +2047,7 @@ misc.o misc.lo: misc.cc include/item.hh include/boxes.hh \ include/direction.hh include/misc.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/scalar.hh \ include/grouping.hh include/minterval.hh -molecule.o molecule.lo: molecule.cc ../flower/include/interval.hh \ +molecule.o: molecule.cc ../flower/include/interval.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/compare.hh include/dimen.hh \ ../flower/include/string.hh \ @@ -2038,7 +2064,7 @@ molecule.o molecule.lo: molecule.cc ../flower/include/interval.hh \ include/direction.hh include/atom.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/tex.hh ../flower/include/scalar.hh -music-iterator.o music-iterator.lo: music-iterator.cc include/debug.hh \ +music-iterator.o: music-iterator.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2062,7 +2088,7 @@ music-iterator.o music-iterator.lo: music-iterator.cc include/debug.hh \ ../flower/include/assoc.hh ../flower/include/parray.hh \ include/translation-property.hh include/change-iterator.hh \ include/change-translator.hh -music-list.o music-list.lo: music-list.cc include/music.hh \ +music-list.o: music-list.cc include/music.hh \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/minterval.hh \ @@ -2078,9 +2104,8 @@ music-list.o music-list.lo: music-list.cc include/music.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -music-output-def.o music-output-def.lo: music-output-def.cc \ - include/debug.hh ../flower/include/dstream.hh \ - ../flower/include/string.hh \ +music-output-def.o: music-output-def.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2100,12 +2125,12 @@ music-output-def.o music-output-def.lo: music-output-def.cc \ ../flower/include/rational.hh ../flower/include/pqueue.hh \ ../flower/include/dictionary-iter.hh \ ../flower/include/assoc-iter.hh -music.o music.lo: music.cc include/music.hh \ - ../flower/include/virtual-methods.hh ../lib/include/input.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/minterval.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +music.o: music.cc include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh include/music-list.hh \ @@ -2116,11 +2141,10 @@ music.o music.lo: music.cc include/music.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -musical-request.o musical-request.lo: musical-request.cc \ - include/musical-request.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/request.hh \ - ../flower/include/string.hh \ +musical-request.o: musical-request.cc include/musical-request.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2139,9 +2163,8 @@ musical-request.o musical-request.lo: musical-request.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -my-lily-lexer.o my-lily-lexer.lo: my-lily-lexer.cc \ - include/notename-table.hh ../flower/include/pointer.hh \ - ../flower/include/string.hh \ +my-lily-lexer.o: my-lily-lexer.cc include/notename-table.hh \ + ../flower/include/pointer.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2158,12 +2181,11 @@ my-lily-lexer.o my-lily-lexer.lo: my-lily-lexer.cc \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh ../lib/include/source-file.hh \ include/parseconstruct.hh -my-lily-parser.o my-lily-parser.lo: my-lily-parser.cc \ - include/my-lily-parser.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../lib/include/duration.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh \ @@ -2181,7 +2203,7 @@ my-lily-parser.o my-lily-parser.lo: my-lily-parser.cc \ include/request.hh include/direction.hh \ include/command-request.hh parser.hh include/header.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh -note-column.o note-column.lo: note-column.cc include/dot-column.hh \ +note-column.o: note-column.cc include/dot-column.hh \ include/horizontal-group-item.hh include/elem-group.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -2210,11 +2232,10 @@ note-column.o note-column.lo: note-column.cc include/dot-column.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/rest.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -note-head.o note-head.lo: note-head.cc include/misc.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +note-head.o: note-head.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -2240,12 +2261,11 @@ note-head.o note-head.lo: note-head.cc include/misc.hh \ include/musical-request.hh include/request.hh \ ../lib/include/input.hh include/music.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -note-performer.o note-performer.lo: note-performer.cc \ - include/note-performer.hh include/performer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +note-performer.o: note-performer.cc include/note-performer.hh \ + include/performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2260,7 +2280,7 @@ note-performer.o note-performer.lo: note-performer.cc \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -note.o note.lo: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ +note.o: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ ../flower/include/string.hh \ @@ -2283,9 +2303,8 @@ note.o note.lo: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/identifier.hh include/text-def.hh \ include/general-script-def.hh include/parseconstruct.hh -notename-table.o notename-table.lo: notename-table.cc \ - include/notename-table.hh ../flower/include/pointer.hh \ - ../flower/include/string.hh \ +notename-table.o: notename-table.cc include/notename-table.hh \ + ../flower/include/pointer.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2299,16 +2318,16 @@ notename-table.o notename-table.lo: notename-table.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -offset.o offset.lo: offset.cc ../flower/include/string.hh \ +offset.o: offset.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh -outputter.o outputter.lo: outputter.cc include/outputter.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/tex-stream.hh ../flower/include/string.hh \ +outputter.o: outputter.cc include/outputter.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/tex-stream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2321,10 +2340,9 @@ outputter.o outputter.lo: outputter.cc include/outputter.hh \ ../flower/include/interval.hh include/offset.hh include/axes.hh \ include/direction.hh ../flower/include/varray.hh \ include/dimen.hh include/tex.hh ../flower/include/scalar.hh -p-col.o p-col.lo: p-col.cc include/p-col.hh \ - include/horizontal-group-item.hh include/elem-group.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \ + include/elem-group.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -2345,7 +2363,7 @@ p-col.o p-col.lo: p-col.cc include/p-col.hh \ ../flower/include/plist.icc include/p-score.hh \ include/colhpos.hh include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -p-score.o p-score.lo: p-score.cc include/main.hh include/lily-proto.hh \ +p-score.o: p-score.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/super-elem.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -2378,7 +2396,7 @@ p-score.o p-score.lo: p-score.cc include/main.hh include/lily-proto.hh \ include/item.hh include/header.hh include/word-wrap.hh \ include/break.hh include/gourlay-breaking.hh \ include/outputter.hh -paper-def.o paper-def.lo: paper-def.cc ../flower/include/string.hh \ +paper-def.o: paper-def.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2407,7 +2425,7 @@ paper-def.o paper-def.lo: paper-def.cc ../flower/include/string.hh \ include/translator-group.hh include/global-translator.hh \ ../flower/include/pqueue.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh include/main.hh -parser.o parser.lo: parser.cc ../flower/include/scalar.hh \ +parser.o: parser.cc ../flower/include/scalar.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2442,7 +2460,7 @@ parser.o parser.lo: parser.cc ../flower/include/scalar.hh \ ../flower/include/parray.hh include/score.hh \ include/music-list.hh include/header.hh \ ../lib/include/duration-convert.hh include/change-translator.hh -performance.o performance.lo: performance.cc include/debug.hh \ +performance.o: performance.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2464,8 +2482,7 @@ performance.o performance.lo: performance.cc include/debug.hh \ include/audio-element.hh include/performance.hh \ include/music-output.hh include/score.hh \ ../lib/include/input.hh ../flower/include/parray.hh -performer-group-performer.o performer-group-performer.lo: \ - performer-group-performer.cc \ +performer-group-performer.o: performer-group-performer.cc \ include/performer-group-performer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/parray.hh \ @@ -2489,18 +2506,17 @@ performer-group-performer.o performer-group-performer.lo: \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/translator-group.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -performer.o performer.lo: performer.cc \ - include/performer-group-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/performer.hh include/request.hh \ - ../flower/include/string.hh \ +performer.o: performer.cc include/performer-group-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/performer.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/moment.hh \ @@ -2513,12 +2529,11 @@ performer.o performer.lo: performer.cc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/translator-group.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -pitch-squash-grav.o pitch-squash-grav.lo: pitch-squash-grav.cc \ - include/pitch-squash-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +pitch-squash-grav.o: pitch-squash-grav.cc include/pitch-squash-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2534,11 +2549,10 @@ pitch-squash-grav.o pitch-squash-grav.lo: pitch-squash-grav.cc \ include/offset.hh include/axes.hh include/score-elem.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/drul-array.hh -plet-engraver.o plet-engraver.lo: plet-engraver.cc \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/musical-request.hh \ - include/lily-proto.hh include/request.hh \ - ../flower/include/string.hh \ +plet-engraver.o: plet-engraver.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/musical-request.hh include/lily-proto.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2568,7 +2582,7 @@ plet-engraver.o plet-engraver.lo: plet-engraver.cc \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/stem.hh \ include/molecule.hh -plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.hh \ +plet-spanner.o: plet-spanner.cc include/atom.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2599,11 +2613,11 @@ plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.hh \ include/bow.hh include/directional-spanner.hh \ include/spanner.hh include/stem.hh include/text-def.hh \ include/general-script-def.hh ../lib/include/input.hh -plet-swallow-engraver.o plet-swallow-engraver.lo: \ - plet-swallow-engraver.cc include/musical-request.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/request.hh ../flower/include/string.hh \ +plet-swallow-engraver.o: plet-swallow-engraver.cc \ + include/musical-request.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2618,11 +2632,11 @@ plet-swallow-engraver.o plet-swallow-engraver.lo: \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -priority-halign-grav.o priority-halign-grav.lo: priority-halign-grav.cc \ - include/bar.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +priority-halign-grav.o: priority-halign-grav.cc include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -2643,17 +2657,17 @@ priority-halign-grav.o priority-halign-grav.lo: priority-halign-grav.cc \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/score-priority-grav.hh -property-iterator.o property-iterator.lo: property-iterator.cc \ - include/property-iterator.hh include/music-iterator.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/varray.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +property-iterator.o: property-iterator.cc include/property-iterator.hh \ + include/music-iterator.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/virtual-methods.hh \ include/translation-property.hh include/music.hh \ @@ -2664,7 +2678,7 @@ property-iterator.o property-iterator.lo: property-iterator.cc \ include/translator-group.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -ps-plet.o ps-plet.lo: ps-plet.cc include/main.hh include/lily-proto.hh \ +ps-plet.o: ps-plet.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/misc.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -2688,7 +2702,7 @@ ps-plet.o ps-plet.lo: ps-plet.cc include/main.hh include/lily-proto.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/string-convert.hh -qlp.o qlp.lo: qlp.cc include/debug.hh ../flower/include/dstream.hh \ +qlp.o: qlp.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2700,7 +2714,7 @@ qlp.o qlp.lo: qlp.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/vector.hh -qlpsolve.o qlpsolve.lo: qlpsolve.cc include/ineq-constrained-qp.hh \ +qlpsolve.o: qlpsolve.cc include/ineq-constrained-qp.hh \ ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \ ../flower/include/varray.hh ../flower/include/real.hh \ ../flower/include/virtual-methods.hh \ @@ -2712,8 +2726,8 @@ qlpsolve.o qlpsolve.lo: qlpsolve.cc include/ineq-constrained-qp.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh ../flower/include/choleski.hh -request-iterator.o request-iterator.lo: request-iterator.cc \ - include/translator-group.hh ../flower/include/string.hh \ +request-iterator.o: request-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2735,8 +2749,7 @@ request-iterator.o request-iterator.lo: request-iterator.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/request.hh \ include/direction.hh -request.o request.lo: request.cc include/request.hh \ - ../flower/include/string.hh \ +request.o: request.cc include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2747,9 +2760,8 @@ request.o request.lo: request.cc include/request.hh \ ../flower/include/interval.hh include/lily-proto.hh \ include/direction.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -rest-collision-grav.o rest-collision-grav.lo: rest-collision-grav.cc \ - include/debug.hh ../flower/include/dstream.hh \ - ../flower/include/string.hh \ +rest-collision-grav.o: rest-collision-grav.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2773,7 +2785,7 @@ rest-collision-grav.o rest-collision-grav.lo: rest-collision-grav.cc \ include/axis-group-item.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/elem-group.hh \ include/note-column.hh include/script-column.hh -rest-collision.o rest-collision.lo: rest-collision.cc include/debug.hh \ +rest-collision.o: rest-collision.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2803,11 +2815,11 @@ rest-collision.o rest-collision.lo: rest-collision.cc include/debug.hh \ include/collision.hh include/paper-def.hh \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh -rest-grav.o rest-grav.lo: rest-grav.cc include/rest-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +rest-grav.o: rest-grav.cc include/rest-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2825,7 +2837,7 @@ rest-grav.o rest-grav.lo: rest-grav.cc include/rest-grav.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/drul-array.hh \ include/rest.hh include/rhythmic-head.hh -rest.o rest.lo: rest.cc include/molecule.hh include/lily-proto.hh \ +rest.o: rest.cc include/molecule.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -2851,7 +2863,7 @@ rest.o rest.lo: rest.cc include/molecule.hh include/lily-proto.hh \ include/dots.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh -rhythmic-column-grav.o rhythmic-column-grav.lo: rhythmic-column-grav.cc \ +rhythmic-column-grav.o: rhythmic-column-grav.cc \ include/rhythmic-column-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2884,11 +2896,11 @@ rhythmic-column-grav.o rhythmic-column-grav.lo: rhythmic-column-grav.cc \ include/axis-group-administration.hh include/elem-group.hh \ include/script.hh include/staff-side.hh include/dot-column.hh \ include/horizontal-group-item.hh -rhythmic-head.o rhythmic-head.lo: rhythmic-head.cc \ - include/rhythmic-head.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -2912,11 +2924,11 @@ rhythmic-head.o rhythmic-head.lo: rhythmic-head.cc \ include/axis-group-element.hh \ include/axis-group-administration.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh -score-bar.o score-bar.lo: score-bar.cc include/score-bar.hh \ - include/bar.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +score-bar.o: score-bar.cc include/score-bar.hh include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -2926,7 +2938,7 @@ score-bar.o score-bar.lo: score-bar.cc include/score-bar.hh \ include/graphical-element.hh include/lily-proto.hh \ ../lib/include/proto.hh include/drul-array.hh \ include/direction.hh -score-column.o score-column.lo: score-column.cc include/debug.hh \ +score-column.o: score-column.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2950,9 +2962,8 @@ score-column.o score-column.lo: score-column.cc include/debug.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/score-column.hh \ ../lib/include/moment.hh ../flower/include/rational.hh -score-elem-info.o score-elem-info.lo: score-elem-info.cc \ - include/score-elem-info.hh ../flower/include/scalar.hh \ - ../flower/include/string.hh \ +score-elem-info.o: score-elem-info.cc include/score-elem-info.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2963,10 +2974,9 @@ score-elem-info.o score-elem-info.lo: score-elem-info.cc \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh -score-elem.o score-elem.lo: score-elem.cc include/outputter.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/p-score.hh include/colhpos.hh \ +score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/p-score.hh include/colhpos.hh \ ../flower/include/varray.hh ../flower/include/parray.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -2993,9 +3003,8 @@ score-elem.o score-elem.lo: score-elem.cc include/outputter.hh \ include/p-col.hh include/horizontal-group-item.hh \ include/elem-group.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh -score-grav.o score-grav.lo: score-grav.cc include/super-elem.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -3031,18 +3040,18 @@ score-grav.o score-grav.lo: score-grav.cc include/super-elem.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/command-request.hh include/paper-def.hh \ include/music-output-def.hh -score-performer.o score-performer.lo: score-performer.cc \ - include/score-performer.hh include/performer-group-performer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/performer.hh \ - include/request.hh ../flower/include/string.hh \ +score-performer.o: score-performer.cc include/score-performer.hh \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/moment.hh \ @@ -3063,7 +3072,7 @@ score-performer.o score-performer.lo: score-performer.cc \ ../lib/include/warn.hh include/score.hh \ ../lib/include/source-file.hh ../lib/include/source.hh \ include/audio-staff.hh -score-priority-grav.o score-priority-grav.lo: score-priority-grav.cc \ +score-priority-grav.o: score-priority-grav.cc \ include/horizontal-group-item.hh include/elem-group.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -3088,7 +3097,7 @@ score-priority-grav.o score-priority-grav.lo: score-priority-grav.cc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/assoc-iter.hh include/break-align-item.hh \ include/horizontal-align-item.hh -score.o score.lo: score.cc include/score.hh ../flower/include/varray.hh \ +score.o: score.cc include/score.hh ../flower/include/varray.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -3114,12 +3123,11 @@ score.o score.lo: score.cc include/score.hh ../flower/include/varray.hh \ ../flower/include/scalar.hh ../flower/include/pqueue.hh \ include/header.hh ../flower/include/cpu-timer.hh \ include/main.hh include/paper-def.hh -scoreline.o scoreline.lo: scoreline.cc include/scoreline.hh \ - include/colhpos.hh ../flower/include/varray.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/spanner.hh include/score-elem.hh \ - ../flower/include/parray.hh \ +scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.hh \ + ../flower/include/varray.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/spanner.hh \ + include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -3141,7 +3149,7 @@ scoreline.o scoreline.lo: scoreline.cc include/scoreline.hh \ include/elem-group.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/p-score.hh include/music-output.hh -scores.o scores.lo: scores.cc include/main.hh include/lily-proto.hh \ +scores.o: scores.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score.hh \ ../flower/include/varray.hh ../flower/include/plist.hh \ @@ -3161,8 +3169,7 @@ scores.o scores.lo: scores.cc include/main.hh include/lily-proto.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/header.hh include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -script-column.o script-column.lo: script-column.cc \ - include/script-column.hh \ +script-column.o: script-column.cc include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -3190,7 +3197,7 @@ script-column.o script-column.lo: script-column.cc \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -script-def.o script-def.lo: script-def.cc include/debug.hh \ +script-def.o: script-def.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -3211,11 +3218,11 @@ script-def.o script-def.lo: script-def.cc include/debug.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh ../flower/include/scalar.hh -script-grav.o script-grav.lo: script-grav.cc include/script-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +script-grav.o: script-grav.cc include/script-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3240,8 +3247,7 @@ script-grav.o script-grav.lo: script-grav.cc include/script-grav.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/staff-sym.hh include/spanner.hh \ include/general-script-def.hh -script.o script.lo: script.cc include/script-def.hh \ - ../flower/include/string.hh \ +script.o: script.cc include/script-def.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3267,7 +3273,7 @@ script.o script.lo: script.cc include/script-def.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/stem.hh include/molecule.hh include/lookup.hh \ include/atom.hh ../flower/include/scalar.hh -slur-grav.o slur-grav.lo: slur-grav.cc ../lib/include/proto.hh \ +slur-grav.o: slur-grav.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3301,7 +3307,7 @@ slur-grav.o slur-grav.lo: slur-grav.cc ../lib/include/proto.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/elem-group.hh -slur.o slur.lo: slur.cc include/slur.hh include/directional-spanner.hh \ +slur.o: slur.cc include/slur.hh include/directional-spanner.hh \ include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score-elem.hh \ @@ -3331,11 +3337,11 @@ slur.o slur.lo: slur.cc include/slur.hh include/directional-spanner.hh \ include/stem.hh include/molecule.hh include/p-col.hh \ include/horizontal-group-item.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -span-bar-grav.o span-bar-grav.lo: span-bar-grav.cc include/span-bar.hh \ - include/bar.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -3355,8 +3361,8 @@ span-bar-grav.o span-bar-grav.lo: span-bar-grav.cc include/span-bar.hh \ include/vertical-align-elem.hh include/elem-group.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh -span-bar.o span-bar.lo: span-bar.cc include/dimen.hh \ - ../flower/include/real.hh ../flower/include/string.hh \ +span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3381,9 +3387,9 @@ span-bar.o span-bar.lo: span-bar.cc include/dimen.hh \ include/vertical-align-elem.hh include/elem-group.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh -span-score-bar-grav.o span-score-bar-grav.lo: span-score-bar-grav.cc \ - include/span-score-bar.hh include/span-bar.hh include/bar.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -3403,9 +3409,9 @@ span-score-bar-grav.o span-score-bar-grav.lo: span-score-bar-grav.cc \ include/score-elem-info.hh ../flower/include/scalar.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh -span-score-bar.o span-score-bar.lo: span-score-bar.cc \ - include/span-score-bar.hh include/span-bar.hh include/bar.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +span-score-bar.o: span-score-bar.cc include/span-score-bar.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -3427,8 +3433,8 @@ span-score-bar.o span-score-bar.lo: span-score-bar.cc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh ../flower/include/scalar.hh -spanner.o spanner.lo: spanner.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3451,20 +3457,19 @@ spanner.o spanner.lo: spanner.cc include/debug.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/p-score.hh \ include/colhpos.hh include/music-output.hh include/outputter.hh -spring-spacer.o spring-spacer.lo: spring-spacer.cc \ - include/spring-spacer.hh include/line-spacer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh ../flower/include/vector.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/col-info.hh ../flower/include/pointer.hh \ - include/colhpos.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh \ +spring-spacer.o: spring-spacer.cc include/spring-spacer.hh \ + include/line-spacer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/vector.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/col-info.hh \ + ../flower/include/pointer.hh include/colhpos.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/p-col.hh \ include/horizontal-group-item.hh include/elem-group.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -3485,7 +3490,7 @@ spring-spacer.o spring-spacer.lo: spring-spacer.cc \ include/paper-def.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/dimen.hh include/main.hh -staff-info.o staff-info.lo: staff-info.cc ../lib/include/proto.hh \ +staff-info.o: staff-info.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3508,18 +3513,18 @@ staff-info.o staff-info.lo: staff-info.cc ../lib/include/proto.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh -staff-performer.o staff-performer.lo: staff-performer.cc \ - include/staff-performer.hh include/performer-group-performer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/performer.hh \ - include/request.hh ../flower/include/string.hh \ +staff-performer.o: staff-performer.cc include/staff-performer.hh \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/moment.hh \ @@ -3534,7 +3539,7 @@ staff-performer.o staff-performer.lo: staff-performer.cc \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/audio-column.hh include/audio-item.hh \ include/audio-element.hh include/audio-staff.hh -staff-side.o staff-side.lo: staff-side.cc ../flower/include/interval.hh \ +staff-side.o: staff-side.cc ../flower/include/interval.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/compare.hh include/paper-def.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -3556,12 +3561,11 @@ staff-side.o staff-side.lo: staff-side.cc ../flower/include/interval.hh \ include/direction.hh include/staff-sym.hh include/spanner.hh \ include/drul-array.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -staff-sym-grav.o staff-sym-grav.lo: staff-sym-grav.cc \ - include/staff-sym-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3586,11 +3590,11 @@ staff-sym-grav.o staff-sym-grav.lo: staff-sym-grav.cc \ include/elem-group.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh -staff-sym.o staff-sym.lo: staff-sym.cc include/staff-sym.hh \ - include/spanner.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -3612,11 +3616,11 @@ staff-sym.o staff-sym.lo: staff-sym.cc include/staff-sym.hh \ include/molecule.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/dimen.hh -stem-grav.o stem-grav.lo: stem-grav.cc include/stem-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +stem-grav.o: stem-grav.cc include/stem-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3641,7 +3645,7 @@ stem-grav.o stem-grav.lo: stem-grav.cc include/stem-grav.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ ../lib/include/duration-convert.hh include/misc.hh \ include/grouping.hh include/abbrev.hh -stem-info.o stem-info.lo: stem-info.cc ../lib/include/proto.hh \ +stem-info.o: stem-info.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/dimen.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -3668,7 +3672,7 @@ stem-info.o stem-info.lo: stem-info.cc ../lib/include/proto.hh \ include/paper-def.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh include/stem-info.hh -stem.o stem.lo: stem.cc include/stem.hh include/item.hh include/boxes.hh \ +stem.o: stem.cc include/stem.hh include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -3699,9 +3703,8 @@ stem.o stem.lo: stem.cc include/stem.hh include/item.hh include/boxes.hh \ include/misc.hh include/grouping.hh include/minterval.hh \ include/beam.hh include/directional-spanner.hh \ include/spanner.hh include/rest.hh -super-elem.o super-elem.lo: super-elem.cc include/super-elem.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -3720,7 +3723,7 @@ super-elem.o super-elem.lo: super-elem.cc include/super-elem.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/music-output.hh include/outputter.hh -swallow-grav.o swallow-grav.lo: swallow-grav.cc include/swallow-grav.hh \ +swallow-grav.o: swallow-grav.cc include/swallow-grav.hh \ include/engraver.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -3736,7 +3739,7 @@ swallow-grav.o swallow-grav.lo: swallow-grav.cc include/swallow-grav.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -swallow-perf.o swallow-perf.lo: swallow-perf.cc include/swallow-perf.hh \ +swallow-perf.o: swallow-perf.cc include/swallow-perf.hh \ include/performer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -3752,11 +3755,10 @@ swallow-perf.o swallow-perf.lo: swallow-perf.cc include/swallow-perf.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -symtable.o symtable.lo: symtable.cc include/misc.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +symtable.o: symtable.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -3768,7 +3770,7 @@ symtable.o symtable.lo: symtable.cc include/misc.hh \ include/axes.hh ../flower/include/assoc.hh \ ../flower/include/assoc-iter.hh include/symtable.hh \ ../flower/include/dictionary.hh -template1.o template1.lo: template1.cc ../lib/include/proto.hh \ +template1.o: template1.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/idealspacing.hh include/lily-proto.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -3797,19 +3799,18 @@ template1.o template1.lo: template1.cc ../lib/include/proto.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/spanner.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc -template2.o template2.lo: template2.cc include/line-spacer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh ../flower/include/vector.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../flower/include/plist.tcc ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/pcursor.tcc -template3.o template3.lo: template3.cc include/atom.hh \ - ../flower/include/string.hh \ +template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/vector.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../flower/include/plist.tcc \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/pcursor.tcc +template3.o: template3.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3824,8 +3825,8 @@ template3.o template3.lo: template3.cc include/atom.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/direction.hh ../flower/include/plist.tcc \ ../flower/include/pcursor.tcc -template4.o template4.lo: template4.cc -template5.o template5.lo: template5.cc ../lib/include/proto.hh \ +template4.o: template4.cc +template5.o: template5.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -3834,7 +3835,7 @@ template5.o template5.lo: template5.cc ../lib/include/proto.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/interval.tcc ../flower/include/interval.hh \ ../flower/include/flower-debug.hh ../flower/include/dstream.hh -template6.o template6.lo: template6.cc ../lib/include/proto.hh \ +template6.o: template6.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.tcc ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -3850,7 +3851,7 @@ template6.o template6.lo: template6.cc ../lib/include/proto.hh \ ../flower/include/scalar.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh ../flower/include/varray.hh \ ../flower/include/parray.hh ../lib/include/input.hh -template7.o template7.lo: template7.cc ../lib/include/proto.hh \ +template7.o: template7.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3867,7 +3868,7 @@ template7.o template7.lo: template7.cc ../lib/include/proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh include/music-iterator.hh \ ../flower/include/varray.hh -template8.o template8.lo: template8.cc ../lib/include/proto.hh \ +template8.o: template8.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3883,8 +3884,7 @@ template8.o template8.lo: template8.cc ../lib/include/proto.hh \ ../flower/include/virtual-methods.hh include/audio-staff.hh \ include/midi-item.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc -tex-beam.o tex-beam.lo: tex-beam.cc include/atom.hh \ - ../flower/include/string.hh \ +tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3907,11 +3907,11 @@ tex-beam.o tex-beam.lo: tex-beam.cc include/atom.hh \ include/music-output-def.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/string-convert.hh include/main.hh -tex-slur.o tex-slur.lo: tex-slur.cc include/main.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/misc.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh ../flower/include/compare.hh \ +tex-slur.o: tex-slur.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -3931,8 +3931,7 @@ tex-slur.o tex-slur.lo: tex-slur.cc include/main.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/string-convert.hh -tex-stream.o tex-stream.lo: tex-stream.cc include/tex.hh \ - ../flower/include/string.hh \ +tex-stream.o: tex-stream.cc include/tex.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3942,7 +3941,7 @@ tex-stream.o tex-stream.lo: tex-stream.cc include/tex.hh \ include/main.hh include/lily-proto.hh ../lib/include/proto.hh \ include/tex-stream.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -tex.o tex.lo: tex.cc include/dimen.hh ../flower/include/real.hh \ +tex.o: tex.cc include/dimen.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -3951,8 +3950,8 @@ tex.o tex.lo: tex.cc include/dimen.hh ../flower/include/real.hh \ include/offset.hh include/axes.hh ../flower/include/scalar.hh \ include/atom.hh include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/varray.hh -text-def.o text-def.lo: text-def.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +text-def.o: text-def.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3973,7 +3972,7 @@ text-def.o text-def.lo: text-def.cc include/debug.hh \ ../flower/include/assoc.hh include/molecule.hh \ include/text-def.hh include/general-script-def.hh \ ../lib/include/input.hh include/dimen.hh -text-item.o text-item.lo: text-item.cc include/musical-request.hh \ +text-item.o: text-item.cc include/musical-request.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/request.hh ../flower/include/string.hh \ @@ -4002,7 +4001,7 @@ text-item.o text-item.lo: text-item.cc include/musical-request.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -text-spanner.o text-spanner.lo: text-spanner.cc include/molecule.hh \ +text-spanner.o: text-spanner.cc include/molecule.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -4029,11 +4028,11 @@ text-spanner.o text-spanner.lo: text-spanner.cc include/molecule.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/atom.hh -tie-grav.o tie-grav.lo: tie-grav.cc include/tie-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -4057,7 +4056,7 @@ tie-grav.o tie-grav.lo: tie-grav.cc include/tie-grav.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -tie.o tie.lo: tie.cc include/paper-def.hh include/lily-proto.hh \ +tie.o: tie.cc include/paper-def.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ @@ -4084,9 +4083,9 @@ tie.o tie.lo: tie.cc include/paper-def.hh include/lily-proto.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -time-description.o time-description.lo: time-description.cc \ - include/time-description.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh ../flower/include/compare.hh \ +time-description.o: time-description.cc include/time-description.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -4094,7 +4093,7 @@ time-description.o time-description.lo: time-description.cc \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/warn.hh -timing-grav.o timing-grav.lo: timing-grav.cc include/score-grav.hh \ +timing-grav.o: timing-grav.cc include/score-grav.hh \ include/engraver-group.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/parray.hh \ @@ -4121,9 +4120,8 @@ timing-grav.o timing-grav.lo: timing-grav.cc include/score-grav.hh \ include/timing-translator.hh include/time-description.hh \ include/grouping.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -timing-translator.o timing-translator.lo: timing-translator.cc \ - include/timing-translator.hh include/translator.hh \ - ../flower/include/string.hh \ +timing-translator.o: timing-translator.cc include/timing-translator.hh \ + include/translator.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4145,7 +4143,7 @@ timing-translator.o timing-translator.lo: timing-translator.cc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/global-translator.hh ../flower/include/pqueue.hh -translation-property.o translation-property.lo: translation-property.cc \ +translation-property.o: translation-property.cc \ include/translation-property.hh include/music.hh \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -4157,15 +4155,15 @@ translation-property.o translation-property.lo: translation-property.cc \ ../flower/include/international.hh ../flower/include/scalar.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -translator-ctors.o translator-ctors.lo: translator-ctors.cc \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/translator.hh ../flower/include/string.hh \ +translator-ctors.o: translator-ctors.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/translator.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/lily-proto.hh \ @@ -4175,8 +4173,8 @@ translator-ctors.o translator-ctors.lo: translator-ctors.cc \ ../flower/include/parray.hh ../lib/include/input.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -translator-group.o translator-group.lo: translator-group.cc \ - include/music-output-def.hh ../flower/include/string.hh \ +translator-group.o: translator-group.cc include/music-output-def.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4194,7 +4192,7 @@ translator-group.o translator-group.lo: translator-group.cc \ ../lib/include/input.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ ../flower/include/rational.hh -translator.o translator.lo: translator.cc include/translator.hh \ +translator.o: translator.cc include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -4214,7 +4212,7 @@ translator.o translator.lo: translator.cc include/translator.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary-iter.hh \ ../flower/include/assoc-iter.hh ../flower/include/rational.hh -type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \ +type-swallow-trans.o: type-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -4231,13 +4229,13 @@ type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -version.o version.lo: version.cc include/main.hh include/lily-proto.hh \ +version.o: version.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -vertical-align-elem.o vertical-align-elem.lo: vertical-align-elem.cc \ +vertical-align-elem.o: vertical-align-elem.cc \ include/vertical-align-elem.hh include/elem-group.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -4252,10 +4250,10 @@ vertical-align-elem.o vertical-align-elem.lo: vertical-align-elem.cc \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/interval.hh include/axis-group-element.hh \ include/axis-group-administration.hh -vertical-align-grav.o vertical-align-grav.lo: vertical-align-grav.cc \ - include/p-col.hh include/horizontal-group-item.hh \ - include/elem-group.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \ + include/horizontal-group-item.hh include/elem-group.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -4282,12 +4280,12 @@ vertical-align-grav.o vertical-align-grav.lo: vertical-align-grav.cc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/vertical-align-spanner.hh include/spanner.hh \ include/vertical-align-elem.hh -vertical-align-spanner.o vertical-align-spanner.lo: \ - vertical-align-spanner.cc include/vertical-align-spanner.hh \ - include/spanner.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +vertical-align-spanner.o: vertical-align-spanner.cc \ + include/vertical-align-spanner.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -4299,13 +4297,12 @@ vertical-align-spanner.o vertical-align-spanner.lo: \ include/direction.hh include/vertical-align-elem.hh \ include/elem-group.hh include/axis-group-element.hh \ include/axis-group-administration.hh -vertical-group-spanner.o vertical-group-spanner.lo: \ - vertical-group-spanner.cc include/vertical-group-spanner.hh \ - include/axis-group-spanner.hh include/spanner.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +vertical-group-spanner.o: vertical-group-spanner.cc \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -4323,8 +4320,8 @@ vertical-group-spanner.o vertical-group-spanner.lo: \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -voice-iterator.o voice-iterator.lo: voice-iterator.cc \ - include/translator-group.hh ../flower/include/string.hh \ +voice-iterator.o: voice-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4345,15 +4342,15 @@ voice-iterator.o voice-iterator.lo: voice-iterator.cc \ ../flower/include/rational.hh include/music-list.hh \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh -warn.o warn.lo: warn.cc ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +warn.o: warn.cc ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/lily-proto.hh \ @@ -4364,12 +4361,11 @@ warn.o warn.lo: warn.cc ../lib/include/proto.hh \ include/time-description.hh ../lib/include/source-file.hh \ ../lib/include/source.hh include/main.hh \ ../lib/include/input.hh -word-wrap.o word-wrap.lo: word-wrap.cc include/word-wrap.hh \ - include/break.hh ../flower/include/varray.hh \ - ../flower/include/interval.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/compare.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - include/colhpos.hh include/paper-def.hh \ +word-wrap.o: word-wrap.cc include/word-wrap.hh include/break.hh \ + ../flower/include/varray.hh ../flower/include/interval.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/compare.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/colhpos.hh include/paper-def.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ include/music-output-def.hh ../flower/include/string.hh \ @@ -4426,38 +4422,41 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + mostlyclean-libtool mostlyclean-tags \ + mostlyclean-generic -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ + clean-generic mostlyclean-am -distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-generic clean-am +distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ + distclean-tags distclean-generic clean-am maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-generic \ + distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @@ -4466,7 +4465,8 @@ maintainer-clean: maintainer-clean-recursive maintainer-clean-am .PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-data-recursive \ +maintainer-clean-compile mostlyclean-libtool distclean-libtool \ +clean-libtool maintainer-clean-libtool install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ @@ -4504,6 +4504,9 @@ parser.hh: parser.yy # # could be faster: # # $(FLEX) -8 -Cf -t $< > $@ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lily/VERSION b/lily/VERSION index d90599539a..8eb70f97ca 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 49 +PATCH_LEVEL = 50 MY_PATCH_LEVEL = diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am index 5e556de8b7..afaa8bf39c 100644 --- a/lily/include/Makefile.am +++ b/lily/include/Makefile.am @@ -1,8 +1,8 @@ -# Automatically generated from ./lilypond-0.1.49/lily/include/Makefile.am.wild by bin/autowild -# Do not edit -# lily/include/Makefile.am.wild +# Generated automatically by wild-perl 0.1# lily/include/Makefile.am.wild -noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc +noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc EXTRA_DIST = Makefile.am.wild +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in index 9409ae7ea0..7171e5dd95 100644 --- a/lily/include/Makefile.in +++ b/lily/include/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./lily/include/Makefile.am.wild by bin/autowild -# Do not edit -# lily/include/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# lily/include/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -85,7 +95,7 @@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ -noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc +noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc EXTRA_DIST = Makefile.am.wild mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -112,21 +122,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -165,25 +180,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean @@ -197,6 +213,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lily/include/linear-programming.hh b/lily/include/linear-programming.hh new file mode 100644 index 0000000000..1490edfede --- /dev/null +++ b/lily/include/linear-programming.hh @@ -0,0 +1,42 @@ +/* + linear-programming.hh -- declare + + source file of the GNU LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys + + */ + +#ifndef LINEAR_PROGRAMMING_HH +#define LINEAR_PROGRAMMING_HH + +#include "linear-programming.hh" + +/** + + min c* x + + constraints_[i] * x = constraint_rhss_ [i] + + x[j] >= 0 +*/ + +class Linear_programming +{ + Array constraints_; + Array constraint_rhss_; + Vector cost_vec_; + +public: + Vector constraint_solve (Vector initial) const; + int dim () const; + Vector solve (Vector) const; + void add_constraint (Vector c, double r); + Linear_programming (int n); + void set_cost (Vector); + void print () const; + void OK () const; +} + +#endif /* LINEAR_PROGRAMMING_HH */ + diff --git a/lily/include/swallow-grav.hh b/lily/include/swallow-grav.hh index 01f294becf..7cc4a905f1 100644 --- a/lily/include/swallow-grav.hh +++ b/lily/include/swallow-grav.hh @@ -18,7 +18,6 @@ */ class Swallow_engraver : public Engraver { protected: - bool acceptable_request_b (Request*) const; bool do_try_request (Request*) ; public: TRANSLATOR_CLONE(Swallow_engraver); diff --git a/lily/include/tie-grav.hh b/lily/include/tie-grav.hh index dc118c96e0..299e92a376 100644 --- a/lily/include/tie-grav.hh +++ b/lily/include/tie-grav.hh @@ -26,7 +26,6 @@ protected: virtual void do_removal_processing (); virtual void acknowledge_element (Score_elem_info); virtual bool do_try_request (Request*); - virtual bool acceptable_request_b (Request*); virtual void do_process_requests(); virtual void do_post_move_processing(); virtual void do_pre_move_processing(); diff --git a/lily/lily-version.cc b/lily/lily-version.cc index fcf2f8e8e3..a5aace6974 100644 --- a/lily/lily-version.cc +++ b/lily/lily-version.cc @@ -4,7 +4,7 @@ // #define VERSION_SZ MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL MY_PATCH_LEVEL #define VERSION_SZ TOPLEVEL_VERSION -static char *s = "GNU LilyPond " VERSION_SZ " #%d"; +static char *s = "GNU LilyPond " VERSION_SZ ; char const * diff --git a/lily/linear-programming.cc b/lily/linear-programming.cc new file mode 100644 index 0000000000..83c4823db1 --- /dev/null +++ b/lily/linear-programming.cc @@ -0,0 +1,90 @@ +/* + linear-programming.cc -- implement + + source file of the GNU LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys + + */ + +#if 0 +#include "linear-programming.hh" + +Linear_programming::Linear_programming (int n) + : cost_vec_ (n) +{ +} +int +Linear_programming::dim () const +{ + return cost_vec_.dim (); +} + +void +Linear_programming::add_constraint (Vector c, double r) +{ + assert (c.dim () == cost_vec_); + constraints_.push (c); + constraint_rhss_.push (r); +} + +void +Linear_programming::set_cost (Vector c) +{ + cost_vec_ = c; +} + +void +Linear_programming::print () const +{ + DOUT << "cost: " << cost_vec_; + for (int i=0; constraints_.size (); i++) + { + DOUT << constraints_[i] << ". x = " << constraint_rhss_[i]; + } +} + +void +Linear_programming::OK () const +{ + assert (constraint_rhss_.size () == constraints_.size ()); + for (int i=0; constraints_.size (); i++) + constraints_[i].dim () == cost_vec_.dim (); +} + + +bool +Linear_programming::check_constraints (Vector v) const +{ + bool is_cool = true; + for (int i=0; is_cool && i < v.dim (); i++) + is_cool = is_cool && v[i] >= 0; + for (int i=0; is_cool && i < constraints_.size (); i++) + is_cool = is_cool && (constraints_[i] * v <= constraint_rhss_[i]); + + + + return is_cool; +} + +Vector +Linear_programming::solve (Vector initial) const +{ + Array binding, nonbinding; + + assert (check_constraints (initial)); + OK (); + + Vector x (initial); + Real value (x * cost_vec_): + + for (int i=0; i < constraints_.size ()) + nonbinding.push (i); + + while () + { + get_negative_index ( + } + +} +#endif diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc index 51af06c230..8fb616fcb7 100644 --- a/lily/tex-slur.cc +++ b/lily/tex-slur.cc @@ -160,11 +160,14 @@ Lookup::ps_slur (Real dy , Real dx, Real ht, Real dir) const } String mf = "\\embeddedmf{" + name + "}{\n"; + mf += "mode_setup;\n"; mf += "staffsize\\#:=" + String_convert::int_str ((int)paper_l_->get_var ("barsize"), "%d") + "pt\\#;\n"; + mf += "interline#:=staffsize#/4;\n"; + mf += "stafflinethickness#:=0.1interline#;\n"; mf += "input feta-sleur;\n"; - mf += "drawslur(" + dx_str + "," + dy_str + "," + dir_str + ");\n"; + mf += "slurchar(" + dx_str + "," + dy_str + "," + dir_str + ");\n"; mf += "end.\n"; mf += "}\n"; diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc index c3ea8c1e36..453a955072 100644 --- a/lily/tie-grav.cc +++ b/lily/tie-grav.cc @@ -38,17 +38,12 @@ Tie_engraver::do_post_move_processing() } } -bool -Tie_engraver::acceptable_request_b (Request*r) -{ - return r->musical() && r->musical ()->tie (); -} - bool Tie_engraver::do_try_request (Request*r) { - if (!acceptable_request_b (r)) + if (! (r->musical() && r->musical ()->tie ())) return false; + if (req_l_) { return false; diff --git a/ltconfig b/ltconfig new file mode 100644 index 0000000000..3c1b8d42ff --- /dev/null +++ b/ltconfig @@ -0,0 +1,1520 @@ +#! /bin/sh + +# ltconfig - Create a system-specific libtool. +# Copyright (C) 1996-1998 Free Software Foundation, Inc. +# Gordon Matzigkeit , 1996 +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# A lot of this script is taken from autoconf-2.10. + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi + +echo=echo +if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : +else + # The Solaris and AIX default echo program unquotes backslashes. + # This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # So, we emulate echo with printf '%s\n' + echo="printf %s\\n" + if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : + else + # Oops. We have no working printf. Try to find a not-so-buggy echo. + echo=echo + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH /usr/ucb; do + if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then + echo="$dir/echo" + break + fi + done + IFS="$save_ifs" + fi +fi + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e s/^X//' +sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' + +# The name of this program. +progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` + +# Constants: +PROGRAM=ltconfig +PACKAGE=libtool +VERSION=1.1.1 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' +rm="rm -f" + +help="Try \`$progname --help' for more information." + +# Global variables: +can_build_shared=yes +enable_shared=yes +# All known linkers require a `.a' archive for static linking. +enable_static=yes +ltmain= +silent= +srcdir= +ac_config_guess= +ac_config_sub= +host= +nonopt= +verify_host=yes +with_gcc=no +with_gnu_ld=no + +old_AR="$AR" +old_CC="$CC" +old_CFLAGS="$CFLAGS" +old_CPPFLAGS="$CPPFLAGS" +old_LD="$LD" +old_LN_S="$LN_S" +old_NM="$NM" +old_RANLIB="$RANLIB" + +# Parse the command line options. +args= +prev= +for option +do + case "$option" in + -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + eval "$prev=\$option" + prev= + continue + fi + + case "$option" in + --help) cat <&2 + echo "$help" 1>&2 + exit 1 + ;; + + *) + if test -z "$ltmain"; then + ltmain="$option" + elif test -z "$host"; then +# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1 +# if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then +# echo "$progname: warning \`$option' is not a valid host type" 1>&2 +# fi + host="$option" + else + echo "$progname: too many arguments" 1>&2 + echo "$help" 1>&2 + exit 1 + fi ;; + esac +done + +if test -z "$ltmain"; then + echo "$progname: you must specify a LTMAIN file" 1>&2 + echo "$help" 1>&2 + exit 1 +fi + +if test -f "$ltmain"; then : +else + echo "$progname: \`$ltmain' does not exist" 1>&2 + echo "$help" 1>&2 + exit 1 +fi + +# Quote any args containing shell metacharacters. +ltconfig_args= +for arg +do + case "$arg" in + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ltconfig_args="$ltconfig_args '$arg'" ;; + *) ltconfig_args="$ltconfig_args $arg" ;; + esac +done + +# A relevant subset of AC_INIT. + +# 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 +# 5 compiler messages saved in config.log +# 6 checking for... messages and results +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>>./config.log + +# NLS nuisances. +# Only set LANG and LC_ALL to C if already set. +# These must not be set unconditionally because not all systems understand +# e.g. LANG=C (notably SCO). +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LANG+set}" = set; then LANG=C; export LANG; fi + +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 + +if test -z "$srcdir"; then + # Assume the source directory is the same one as the path to ltmain.sh. + srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'` + test "$srcdir" = "$ltmain" && srcdir=. +fi + +trap "$rm conftest*; exit 1" 1 2 15 +if test "$verify_host" = yes; then + # Check for config.guess and config.sub. + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/config.guess; then + ac_aux_dir=$ac_dir + break + fi + done + if test -z "$ac_aux_dir"; then + echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2 + echo "$help" 1>&2 + exit 1 + fi + ac_config_guess=$ac_aux_dir/config.guess + ac_config_sub=$ac_aux_dir/config.sub + + # Make sure we can run config.sub. + if $ac_config_sub sun4 >/dev/null 2>&1; then : + else + echo "$progname: cannot run $ac_config_sub" 1>&2 + echo "$help" 1>&2 + exit 1 + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 + + host_alias=$host + case "$host_alias" in + "") + if host_alias=`$ac_config_guess`; then : + else + echo "$progname: cannot guess host type; you must specify one" 1>&2 + echo "$help" 1>&2 + exit 1 + fi ;; + esac + host=`$ac_config_sub $host_alias` + echo "$ac_t$host" 1>&6 + + # Make sure the host verified. + test -z "$host" && exit 1 + +elif test -z "$host"; then + echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2 + echo "$help" 1>&2 + exit 1 +else + host_alias=$host +fi + +# Transform linux* to *-*-linux-gnu*, to support old configure scripts. +case "$host_os" in +linux-gnu*) ;; +linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` +esac + +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +case "$host_os" in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "${COLLECT_NAMES+set}" != set; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR cru $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +# Set a sane default for `AR'. +test -z "$AR" && AR=ar + +# If RANLIB is not set, then run the test. +if test "${RANLIB+set}" != "set"; then + result=no + + echo $ac_n "checking for ranlib... $ac_c" 1>&6 + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/ranlib; then + RANLIB="ranlib" + result="ranlib" + break + fi + done + IFS="$save_ifs" + + echo "$ac_t$result" 1>&6 +fi + +if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds" +fi + +# Check to see if we are using GCC. +if test "$with_gcc" != yes || test -z "$CC"; then + # If CC is not set, then try to find GCC or a usable CC. + if test -z "$CC"; then + echo $ac_n "checking for gcc... $ac_c" 1>&6 + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + IFS="$save_ifs" + test -z "$dir" && dir=. + if test -f $dir/gcc; then + CC="gcc" + break + fi + done + IFS="$save_ifs" + + if test -n "$CC"; then + echo "$ac_t$CC" 1>&6 + else + echo "$ac_t"no 1>&6 + fi + fi + + # Not "gcc", so try "cc", rejecting "/usr/ucb/cc". + if test -z "$CC"; then + echo $ac_n "checking for cc... $ac_c" 1>&6 + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + cc_rejected=no + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/cc; then + if test "$dir/cc" = "/usr/ucb/cc"; then + cc_rejected=yes + continue + fi + CC="cc" + break + fi + done + IFS="$save_ifs" + if test $cc_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same name, so the bogon will be chosen + # first if we set CC to just the name; use the full file name. + shift + set dummy "$dir/cc" "$@" + shift + CC="$@" + fi + fi + + if test -n "$CC"; then + echo "$ac_t$CC" 1>&6 + else + echo "$ac_t"no 1>&6 + fi + + if test -z "$CC"; then + echo "$progname: error: no acceptable cc found in \$PATH" 1>&2 + exit 1 + fi + fi + + # Now see if the compiler is really GCC. + with_gcc=no + echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 + echo "$progname:424: checking whether we are using GNU C" >&5 + + $rm conftest.c + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + with_gcc=yes + fi + $rm conftest.c + echo "$ac_t$with_gcc" 1>&6 +fi + +# Allow CC to be a program name with arguments. +set dummy $CC +compiler="$2" + +echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 +pic_flag= +special_shlib_compile_flags= +wl= +link_static_flag= +no_builtin_flag= + +if test "$with_gcc" = yes; then + wl='-Wl,' + link_static_flag='-static' + no_builtin_flag=' -fno-builtin' + + case "$host_os" in + aix3* | aix4* | irix5* | irix6* | osf3* | osf4*) + # PIC is the default for these OSes. + ;; + os2*) + # We can build DLLs from non-PIC. + ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + pic_flag='-m68020 -resident32 -malways-restore-a4' + ;; + *) + case $host_cpu in + m68*) + # This generates more efficient code. + pic_flag=-fpic + ;; + *) + pic_flag='-fPIC' + ;; + esac + ;; + esac +else + # PORTME Check for PIC flags for the system compiler. + case "$host_os" in + aix3* | aix4*) + # All AIX code is PIC. + link_static_flag='-bnso -bI:/lib/syscalls.exp' + ;; + + hpux9* | hpux10*) + # Is there a better link_static_flag that works with the bundled CC? + wl='-Wl,' + link_static_flag="${wl}-a ${wl}archive" + pic_flag='+Z' + ;; + + irix5* | irix6*) + wl='-Wl,' + link_static_flag='-non_shared' + # PIC (with -KPIC) is the default. + ;; + + os2*) + # We can build DLLs from non-PIC. + ;; + + osf3* | osf4*) + # All OSF/1 code is PIC. + wl='-Wl,' + link_static_flag='-non_shared' + ;; + + sco3.2v5*) + pic_flag='-Kpic' + link_static_flag='-dn' + special_shlib_compile_flags='-belf' + ;; + + solaris2*) + pic_flag='-KPIC' + link_static_flag='-Bstatic' + wl='-Wl,' + ;; + + sunos4*) + pic_flag='-PIC' + link_static_flag='-Bstatic' + wl='-Qoption ld ' + ;; + + sysv4.2uw2*) + pic_flag='-KPIC' + link_static_flag='-Bstatic' + wl='-Wl,' + ;; + + uts4*) + pic_flag='-pic' + link_static_flag='-Bstatic' + ;; + + *) + can_build_shared=no + ;; + esac +fi + +if test -n "$pic_flag"; then + echo "$ac_t$pic_flag" 1>&6 + + # Check to make sure the pic_flag actually works. + echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6 + $rm conftest* + echo > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pic_flag -DPIC" + echo "$progname:555: checking if $compiler PIC flag $pic_flag works" >&5 + if { (eval echo $progname:556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + # Append any warnings to the config.log. + cat conftest.err 1>&5 + + # On HP-UX, both CC and GCC only warn that PIC is supported... then they + # create non-PIC objects. So, if there were any warnings, we assume that + # PIC is not supported. + if test -s conftest.err; then + echo "$ac_t"no 1>&6 + can_build_shared=no + pic_flag= + else + echo "$ac_t"yes 1>&6 + pic_flag=" $pic_flag" + fi + else + # Append any errors to the config.log. + cat conftest.err 1>&5 + can_build_shared=no + pic_flag= + echo "$ac_t"no 1>&6 + fi + CFLAGS="$save_CFLAGS" + $rm conftest* +else + echo "$ac_t"none 1>&6 +fi + +# Check for any special shared library compilation flags. +if test -n "$special_shlib_compile_flags"; then + echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2 + if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$special_shlib_compile_flags[ ]" >/dev/null; then : + else + echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2 + can_build_shared=no + fi +fi + +echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6 +$rm conftest* +echo 'main(){return(0);}' > conftest.c +save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS $link_static_flag" +echo "$progname:599: checking if $compiler static flag $link_static_flag works" >&5 +if { (eval echo $progname:600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + echo "$ac_t$link_static_flag" 1>&6 +else + echo "$ac_t"none 1>&6 + link_static_flag= +fi +LDFLAGS="$save_LDFLAGS" +$rm conftest* + +if test -z "$LN_S"; then + # Check to see if we can use ln -s, or we need hard links. + echo $ac_n "checking whether ln -s works... $ac_c" 1>&6 + $rm conftestdata + if ln -s X conftestdata 2>/dev/null; then + $rm conftestdata + LN_S="ln -s" + else + LN_S=ln + fi + if test "$LN_S" = "ln -s"; then + echo "$ac_t"yes 1>&6 + else + echo "$ac_t"no 1>&6 + fi +fi + +# Make sure LD is an absolute path. +if test -z "$LD"; then + ac_prog=ld + if test "$with_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 "$progname:632: 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 are not 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 "$progname:650: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 + echo "$progname:653: checking for non-GNU ld" >&5 + fi + + 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 + 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 "$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" + fi + + if test -n "$LD"; then + echo "$ac_t$LD" 1>&6 + else + echo "$ac_t"no 1>&6 + fi + + if test -z "$LD"; then + echo "$progname: error: no acceptable ld found in \$PATH" 1>&2 + exit 1 + fi +fi + +# Check to see if it really is or is not GNU ld. +echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6 +# I'd rather use --version here, but apparently some GNU ld's only accept -v. +if $LD -v 2>&1 &5; then + with_gnu_ld=yes +else + with_gnu_ld=no +fi +echo "$ac_t$with_gnu_ld" 1>&6 + +# See if the linker supports building shared libraries. +echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6 + +allow_undefined_flag= +no_undefined_flag= +archive_cmds= +old_archive_from_new_cmds= +export_dynamic_flag_spec= +hardcode_libdir_flag_spec= +hardcode_libdir_separator= +hardcode_direct=no +hardcode_minus_L=no +hardcode_shlibpath_var=unsupported +runpath_var= + +case "$host_os" in +amigaos* | sunos4*) + # On these operating systems, we should treat GNU ld like the system ld. + gnu_ld_acts_native=yes + ;; +*) + gnu_ld_acts_native=no + ;; +esac + +ld_shlibs=yes +if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then + + # See if GNU ld supports shared libraries. + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' + runpath_var=LD_RUN_PATH + ld_shlibs=yes + else + ld_shlibs=no + fi + + if test "$ld_shlibs" = yes; then + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + fi +else + # PORTME fill in a description of your system's linker (not GNU ld) + case "$host_os" in + aix3*) + allow_undefined_flag=unsupported + archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE;$AR cru $lib $objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$with_gcc" = yes && test -z "$link_static_flag"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix4*) + allow_undefined_flag=unsupported + archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$CC -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry;$AR cru $lib $objdir/$soname' + hardcode_direct=yes + hardcode_minus_L=yes + ;; + + amigaos*) + archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib$libobjs' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3, at last, uses gcc -shared to do shared libraries. + freebsd3*) + archive_cmds='$CC -shared -o $lib$libobjs' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib' + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs' + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + irix5* | irix6*) + archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + ;; + + netbsd*) + # Tested with NetBSD 1.2 ld + archive_cmds='$LD -Bshareable -o $lib$libobjs' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + openbsd*) + archive_cmds='$LD -Bshareable -o $lib$libobjs' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def;$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def;$echo DATA >> $objdir/$libname.def;$echo " SINGLE NONSHARED" >> $objdir/$libname.def;$echo EXPORTS >> $objdir/$libname.def;emxexp$libobjs >> $objdir/$libname.def;$CC -Zdll -Zcrtdll -o $lib$libobjs $objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' + ;; + + osf3* | osf4*) + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + sco3.2v5*) + archive_cmds='$LD -G -o $lib$libobjs' + hardcode_direct=yes + ;; + + solaris2*) + no_undefined_flag=' -z text' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + + # Solaris 2 before 2.5 hardcodes -L paths. + case "$host_os" in + solaris2.[0-4]*) + hardcode_minus_L=yes + ;; + esac + ;; + + sunos4*) + if test "$with_gcc" = yes; then + archive_cmds='$CC -shared -o $lib$libobjs' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs' + fi + + if test "$with_gnu_ld" = yes; then + export_dynamic_flag_spec='${wl}-export-dynamic' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib$libobjs' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + can_build_shared=no + ;; + esac +fi +echo "$ac_t$ld_shlibs" 1>&6 + +if test -z "$NM"; then + echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 + case "$NM" in + /* | [A-Za-z]:\\*) ;; # 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 + NM="$ac_dir/nm -B" + elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + NM="$ac_dir/nm -p" + else + NM="$ac_dir/nm" + fi + break + fi + done + IFS="$ac_save_ifs" + test -z "$NM" && NM=nm + ;; + esac + echo "$ac_t$NM" 1>&6 +fi + +# Check for command to grab the raw symbol name followed by C symbol from nm. +echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6 + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRSTU]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \1' + +# Define system-specific variables. +case "$host_os" in +aix*) + symcode='[BCDTU]' + ;; +irix*) + # Cannot use undefined symbols on IRIX because inlined functions mess us up. + symcode='[BCDEGRST]' + ;; +solaris2*) + symcode='[BDTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then + symcode='[ABCDGISTUW]' +fi + +# Write the raw and C identifiers. +global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'" + +# Check to see that the pipe works correctly. +pipe_works=no +$rm conftest* +cat > conftest.c <&5 +if { (eval echo $progname:980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then + # Now try to grab the symbols. + nlist=conftest.nm + if { echo "$progname:983: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + wcout=`wc "$nlist" 2>/dev/null` + count=`$echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` + (test "$count" -ge 0) 2>/dev/null || count=-1 + else + rm -f "$nlist"T + count=-1 + fi + + # Make sure that we snagged all the symbols we need. + if egrep ' nm_test_var$' "$nlist" >/dev/null; then + if egrep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.c +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c + + cat <> conftest.c +#if defined (__STDC__) && __STDC__ +# define __ptr_t void * +#else +# define __ptr_t char * +#endif + +/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ +int dld_preloaded_symbol_count = $count; + +/* The mapping between symbol names and symbols. */ +struct { + char *name; + __ptr_t address; +} +dld_preloaded_symbols[] = +{ +EOF + sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c + cat <<\EOF >> conftest.c + {0, (__ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.o conftestm.o + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS='conftestm.o' + CFLAGS="$CFLAGS$no_builtin_flag" + if { (eval echo $progname:1041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + pipe_works=yes + else + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 + fi + LIBS="$save_LIBS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $global_symbol_pipe" >&5 + fi +else + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 +fi +$rm conftest* + +# Do not use the global_symbol_pipe unless it works. +echo "$ac_t$pipe_works" 1>&6 +test "$pipe_works" = yes || global_symbol_pipe= + +# Check hardcoding attributes. +echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var"; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && \ + test "$hardcode_minus_L" != no && \ + test "$hardcode_shlibpath_var" != no; then + + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +elif test "$hardcode_direct" != yes && \ + test "$hardcode_minus_L" != yes && \ + test "$hardcode_shlibpath_var" != yes; then + # We cannot hardcode anything. + hardcode_action=unsupported +else + # We can only hardcode existing directories. + hardcode_action=relink +fi +echo "$ac_t$hardcode_action" 1>&6 +test "$hardcode_action" = unsupported && can_build_shared=no + + +reload_flag= +reload_cmds='$LD$reload_flag -o $output$reload_objs' +echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6 +# PORTME Some linker may need a different reload flag. +reload_flag='-r' +echo "$ac_t$reload_flag" +test -n "$reload_flag" && reload_flag=" $reload_flag" + +# PORTME Fill in your ld.so characteristics +library_names_spec= +libname_spec='lib$name' +soname_spec= +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +version_type=none +dynamic_linker="$host_os ld.so" + +echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 +case "$host_os" in +aix3* | aix4*) + version_type=linux + library_names_spec='${libname}${release}.so.$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}.so.$major' + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + ;; + +freebsd2* | freebsd3*) + version_type=sunos + library_names_spec='${libname}${release}.so.$versuffix $libname.so' + finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + ;; + +gnu*) + version_type=sunos + library_names_spec='${libname}${release}.so.$versuffix' + shlibpath_var=LD_LIBRARY_PATH + ;; + +hpux9* | hpux10*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + dynamic_linker="$host_os dld.sl" + version_type=sunos + shlibpath_var=SHLIB_PATH + library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl' + soname_spec='${libname}${release}.sl.$major' + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +irix5* | irix6*) + version_type=osf + soname_spec='${libname}${release}.so' + library_names_spec='${libname}${release}.so.$versuffix $libname.so' + shlibpath_var=LD_LIBRARY_PATH + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux-gnu*) + version_type=linux + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' + soname_spec='${libname}${release}.so.$major' + finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + + if test -f /lib/ld.so.1; then + dynamic_linker='GNU ld.so' + else + # Only the GNU ld.so supports shared libraries on MkLinux. + case "$host_cpu" in + powerpc*) dynamic_linker=no ;; + *) dynamic_linker='Linux ld.so' ;; + esac + fi + ;; + +netbsd* | openbsd*) + version_type=sunos + library_names_spec='${libname}${release}.so.$versuffix' + finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + ;; + +os2*) + libname_spec='$name' + library_names_spec='$libname.dll $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4*) + version_type=osf + soname_spec='${libname}${release}.so' + library_names_spec='${libname}${release}.so.$versuffix $libname.so' + shlibpath_var=LD_LIBRARY_PATH + ;; + +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}.so.$major' + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' + shlibpath_var=LD_LIBRARY_PATH + ;; + +solaris2*) + version_type=linux + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' + soname_spec='${libname}${release}.so.$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}.so.$versuffix' + finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + ;; + +sysv4.2uw2*) + version_type=linux + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' + soname_spec='${libname}${release}.so.$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' + soname_spec='${libname}${release}.so.$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +echo "$ac_t$dynamic_linker" +test "$dynamic_linker" = no && can_build_shared=no + +# Report the final consequences. +echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6 + +echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6 +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds;\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; +esac + +echo "$ac_t$enable_shared" 1>&6 + +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes + +echo "checking whether to build static libraries... $enable_static" 1>&6 + +echo $ac_n "checking for objdir... $ac_c" 1>&6 +rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + objdir=_libs +fi +rmdir .libs 2>/dev/null +echo "$ac_t$objdir" 1>&6 + +# Copy echo and quote the copy, instead of the original, because it is +# used later. +ltecho="$echo" + +# Now quote all the things that may contain metacharacters. +for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ + old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \ + link_static_flag no_builtin_flag export_dynamic_flag_spec \ + libname_spec library_names_spec soname_spec RANLIB \ + old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ + old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \ + allow_undefined_flag no_undefined_flag \ + finish_cmds finish_eval global_symbol_pipe \ + hardcode_libdir_flag_spec hardcode_libdir_separator; do + + case "$var" in + reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | archive_cmds | \ + postinstall_cmds | postuninstall_cmds | finish_cmds) + # Double-quote double-evaled strings. + eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`" + ;; + *) + eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`" + ;; + esac +done + +ofile=libtool +trap "$rm $ofile; exit 1" 1 2 15 +echo creating $ofile +$rm $ofile +cat < $ofile +#! /bin/sh + +# libtool - Provide generalized library-building support services. +# Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION +# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. +# +# Copyright (C) 1996-1998 Free Software Foundation, Inc. +# Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This program was configured as follows, +# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# +# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\ +# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\ +# $0$ltconfig_args +# +# Compiler and other test output produced by $progname, useful for +# debugging $progname, is in ./config.log if it exists. + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="sed -e s/^X//" + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi + +# An echo program that does not interpret backslashes. +echo="$ltecho" + +# The version of $progname that generated this script. +LTCONFIG_VERSION="$VERSION" + +# Shell to use when invoking shell scripts. +SHELL=${CONFIG_SHELL-/bin/sh} + +# Whether or not to build libtool libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build old-style libraries. +build_old_libs=$enable_static + +# The host system. +host_alias="$host_alias" +host="$host" + +# The archiver. +AR="$AR" + +# The default C compiler. +CC="$CC" + +# The linker used to build libraries. +LD="$LD" + +# Whether we need hard or soft links. +LN_S="$LN_S" + +# A BSD-compatible nm program. +NM="$NM" + +# The name of the directory that contains temporary libtool files. +objdir="$objdir" + +# How to create reloadable object files. +reload_flag="$reload_flag" +reload_cmds="$reload_cmds" + +# How to pass a linker flag through the compiler. +wl="$wl" + +# Additional compiler flags for building library objects. +pic_flag="$pic_flag" + +# Compiler flag to prevent dynamic linking. +link_static_flag="$link_static_flag" + +# Compiler flag to turn off builtin functions. +no_builtin_flag="$no_builtin_flag" + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec="$export_dynamic_flag_spec" + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec="$libname_spec" + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec="$library_names_spec" + +# The coded name of the library, if different from the real name. +soname_spec="$soname_spec" + +# Commands used to build and install an old-style archive. +RANLIB="$RANLIB" +old_archive_cmds="$old_archive_cmds" +old_postinstall_cmds="$old_postinstall_cmds" +old_postuninstall_cmds="$old_postuninstall_cmds" + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds="$old_archive_from_new_cmds" + +# Commands used to build and install a shared archive. +archive_cmds="$archive_cmds" +postinstall_cmds="$postinstall_cmds" +postuninstall_cmds="$postuninstall_cmds" + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag="$allow_undefined_flag" + +# Flag that forces no undefined symbols. +no_undefined_flag="$no_undefined_flag" + +# Commands used to finish a libtool library installation in a directory. +finish_cmds="$finish_cmds" + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval="$finish_eval" + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe="$global_symbol_pipe" + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec="$hardcode_libdir_flag_spec" + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator="$hardcode_libdir_separator" + +# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +EOF + +case "$host_os" in +aix3*) + cat <<\EOF >> $ofile +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "${COLLECT_NAMES+set}" != set; then + COLLECT_NAMES= + export COLLECT_NAMES +fi + +EOF + ;; +esac + +# Append the ltmain.sh script. +cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1) + +chmod +x $ofile +exit 0 + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: diff --git a/ltmain.sh b/ltmain.sh new file mode 100644 index 0000000000..707d87c0d6 --- /dev/null +++ b/ltmain.sh @@ -0,0 +1,2446 @@ +# ltmain.sh - Provide generalized library-building support services. +# NOTE: Changing this file will not affect anything until you rerun ltconfig. +# +# Copyright (C) 1996-1998 Free Software Foundation, Inc. +# Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# The name of this program. +progname=`$echo "$0" | sed 's%^.*/%%'` +modename="$progname" + +# Constants. +PROGRAM=ltmain.sh +PACKAGE=libtool +VERSION=1.1.1 + +default_mode= +help="Try \`$progname --help' for more information." +magic="%%%MAGIC variable%%%" +mkdir="mkdir" +mv="mv -f" +rm="rm -f" + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e s/^X//' +sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' + +# NLS nuisances. +# Only set LANG and LC_ALL to C if already set. +# These must not be set unconditionally because not all systems understand +# e.g. LANG=C (notably SCO). +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LANG+set}" = set; then LANG=C; export LANG; fi + +if test "$LTCONFIG_VERSION" != "$VERSION"; then + echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit 1 +fi + +if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + echo "$modename: not configured to build any kind of library" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit 1 +fi + +# Global variables. +mode=$default_mode +nonopt= +prev= +prevopt= +run= +show="$echo" +show_help= +execute_dlfiles= + +# Parse our command line options once, thoroughly. +while test $# -gt 0 +do + arg="$1" + shift + + case "$arg" in + -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case "$prev" in + execute_dlfiles) + eval "$prev=\"\$$prev \$arg\"" + ;; + *) + eval "$prev=\$arg" + ;; + esac + + prev= + prevopt= + continue + fi + + # Have we seen a non-optional argument yet? + case "$arg" in + --help) + show_help=yes + ;; + + --version) + echo "$PROGRAM (GNU $PACKAGE) $VERSION" + exit 0 + ;; + + --dry-run | -n) + run=: + ;; + + --features) + echo "host: $host" + if test "$build_libtool_libs" = yes; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test "$build_old_libs" = yes; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + exit 0 + ;; + + --finish) mode="finish" ;; + + --mode) prevopt="--mode" prev=mode ;; + --mode=*) mode="$optarg" ;; + + --quiet | --silent) + show=: + ;; + + -dlopen) + prevopt="-dlopen" + prev=execute_dlfiles + ;; + + -*) + $echo "$modename: unrecognized option \`$arg'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + + *) + nonopt="$arg" + break + ;; + esac +done + +if test -n "$prevopt"; then + $echo "$modename: option \`$prevopt' requires an argument" 1>&2 + $echo "$help" 1>&2 + exit 1 +fi + +if test -z "$show_help"; then + + # Infer the operation mode. + if test -z "$mode"; then + case "$nonopt" in + *cc | *++ | gcc* | *-gcc*) + mode=link + for arg + do + case "$arg" in + -c) + mode=compile + break + ;; + esac + done + ;; + *db | *dbx) + mode=execute + ;; + *install*|cp|mv) + mode=install + ;; + *rm) + mode=uninstall + ;; + *) + # If we have no mode, but dlfiles were specified, then do execute mode. + test -n "$execute_dlfiles" && mode=execute + + # Just use the default operation mode. + if test -z "$mode"; then + if test -n "$nonopt"; then + $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 + else + $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 + fi + fi + ;; + esac + fi + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then + $echo "$modename: unrecognized option \`-dlopen'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$modename --help --mode=$mode' for more information." + + # These modes are in order of execution frequency so that they run quickly. + case "$mode" in + # libtool compile mode + compile) + modename="$modename: compile" + # Get the compilation command and the source file. + base_compile= + lastarg= + srcfile="$nonopt" + suppress_output= + + for arg + do + # Accept any command-line options. + case "$arg" in + -o) + $echo "$modename: you cannot specify the output filename with \`-o'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + + -static) + build_libtool_libs=no + build_old_libs=yes + continue + ;; + esac + + # Accept the current argument as the source file. + lastarg="$srcfile" + srcfile="$arg" + + # Aesthetically quote the previous argument. + + # Backslashify any backslashes, double quotes, and dollar signs. + # These are the only characters that are still specially + # interpreted inside of double-quoted scrings. + lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` + + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly in scan + # sets, so we specify it separately. + case "$lastarg" in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + lastarg="\"$lastarg\"" + ;; + esac + + # Add the previous argument to base_compile. + if test -z "$base_compile"; then + base_compile="$lastarg" + else + base_compile="$base_compile $lastarg" + fi + done + + # Get the name of the library object. + libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + + # Recognize several different file suffixes. + xform='[cCFSfms]' + case "$libobj" in + *.ada) xform=ada ;; + *.adb) xform=adb ;; + *.ads) xform=ads ;; + *.asm) xform=asm ;; + *.c++) xform=c++ ;; + *.cc) xform=cc ;; + *.cpp) xform=cpp ;; + *.cxx) xform=cxx ;; + *.f90) xform=f90 ;; + *.for) xform=for ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` + + case "$libobj" in + *.lo) obj=`$echo "X$libobj" | $Xsed -e 's/\.lo$/.o/'` ;; + *) + $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2 + exit 1 + ;; + esac + + if test -z "$base_compile"; then + $echo "$modename: you must specify a compilation command" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then + $run $rm $obj $libobj + trap "$run $rm $obj $libobj; exit 1" 1 2 15 + else + $run $rm $libobj + trap "$run $rm $libobj; exit 1" 1 2 15 + fi + + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + # All platforms use -DPIC, to notify preprocessed assembler code. + $show "$base_compile$pic_flag -DPIC $srcfile" + if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then : + else + test -n "$obj" && $run $rm $obj + exit 1 + fi + + # If we have no pic_flag, then copy the object into place and finish. + if test -z "$pic_flag"; then + $show "$LN_S $obj $libobj" + $run $LN_S $obj $libobj + exit $? + fi + + # Just move the object, then go on to compile the next one + $show "$mv $obj $libobj" + $run $mv $obj $libobj || exit 1 + + # Allow error messages only from the first compilation. + suppress_output=' >/dev/null 2>&1' + fi + + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + # Suppress compiler output if we already did a PIC compilation. + $show "$base_compile $srcfile$suppress_output" + if $run eval "$base_compile \$srcfile$suppress_output"; then : + else + $run $rm $obj $libobj + exit 1 + fi + fi + + # Create an invalid libtool object if no PIC, so that we do not + # accidentally link it into a program. + if test "$build_libtool_libs" != yes; then + $show "echo timestamp > $libobj" + $run eval "echo timestamp > \$libobj" || exit $? + fi + + exit 0 + ;; + + # libtool link mode + link) + modename="$modename: link" + CC="$nonopt" + allow_undefined=yes + compile_command="$CC" + finalize_command="$CC" + + compile_shlibpath= + finalize_shlibpath= + deplibs= + dlfiles= + dlprefiles= + export_dynamic=no + hardcode_libdirs= + libobjs= + link_against_libtool_libs= + ltlibs= + objs= + prev= + prevarg= + release= + rpath= + perm_rpath= + temp_rpath= + vinfo= + + # We need to know -static, to get the right output filenames. + for arg + do + case "$arg" in + -all-static | -static) + if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 + fi + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + for arg + do + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case "$prev" in + output) + compile_command="$compile_command @OUTPUT@" + finalize_command="$finalize_command @OUTPUT@" + ;; + esac + + case "$prev" in + dlfiles|dlprefiles) + case "$arg" in + *.la | *.lo) ;; # We handle these cases below. + *) + dlprefiles="$dlprefiles $arg" + test "$prev" = dlfiles && dlfiles="$dlfiles $arg" + prev= + ;; + esac + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath) + rpath="$rpath $arg" + prev= + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi + + prevarg="$arg" + + case "$arg" in + -all-static) + if test -n "$link_static_flag"; then + compile_command="$compile_command $link_static_flag" + finalize_command="$finalize_command $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + if test "$export_dynamic" != yes; then + export_dynamic=yes + if test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + else + arg= + fi + + # Add the symbol object into the linking commands. + compile_command="$compile_command @SYMFILE@" + finalize_command="$finalize_command @SYMFILE@" + fi + ;; + + -L*) + dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` + case "$dir" in + /* | [A-Za-z]:\\*) + # Add the corresponding hardcode_libdir_flag, if it is not identical. + ;; + *) + $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2 + exit 1 + ;; + esac + deplibs="$deplibs $arg" + ;; + + -l*) deplibs="$deplibs $arg" ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -o) prev=output ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -static) + # If we have no pic_flag, then this is the same as -all-static. + if test -z "$pic_flag" && test -n "$link_static_flag"; then + compile_command="$compile_command $link_static_flag" + finalize_command="$finalize_command $link_static_flag" + fi + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case "$arg" in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + ;; + + *.o | *.a) + # A standard object. + objs="$objs $arg" + ;; + + *.lo) + # A library object. + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + if test "$build_libtool_libs" = yes; then + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'` + prev= + fi + libobjs="$libobjs $arg" + ;; + + *.la) + # A libtool-controlled library. + + dlname= + libdir= + library_names= + old_library= + + # Check to see that this really is a libtool archive. + if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : + else + $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2 + exit 1 + fi + + # If there is no directory component, then add one. + case "$arg" in + */* | *\\*) . $arg ;; + *) . ./$arg ;; + esac + + if test -z "$libdir"; then + $echo "$modename: \`$arg' contains no -rpath information" 1>&2 + exit 1 + fi + + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do + linklib="$l" + done + + if test -z "$linklib"; then + $echo "$modename: cannot find name of link library for \`$arg'" 1>&2 + exit 1 + fi + + # Find the relevant object directory and library name. + name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'` + dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$dir" = "X$arg"; then + dir="$objdir" + else + dir="$dir/$objdir" + fi + + # This library was specified with -dlopen. + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + if test -z "$dlname"; then + # If there is no dlname, we need to preload. + prev=dlprefiles + else + # We should not create a dependency on this library, but we + # may need any libraries it requires. + compile_command="$compile_command$dependency_libs" + finalize_command="$finalize_command$dependency_libs" + prev= + continue + fi + fi + + # The library was specified with -dlpreopen. + if test "$prev" = dlprefiles; then + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + dlprefiles="$dlprefiles $dir/$old_library" + else + dlprefiles="$dlprefiles $dir/$linklib" + fi + prev= + fi + + if test "$build_libtool_libs" = yes && test -n "$library_names"; then + link_against_libtool_libs="$link_against_libtool_libs $arg" + if test -n "$shlibpath_var"; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *) temp_rpath="$temp_rpath $dir" ;; + esac + fi + + # This is the magic to use -rpath. + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + # Put the magic libdir with the hardcode flag. + hardcode_libdirs="$libdir" + libdir="@HARDCODE_LIBDIRS@" + else + # Just accumulate the unique libdirs. + case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + libdir= + fi + fi + + if test -n "$libdir"; then + eval flag=\"$hardcode_libdir_flag_spec\" + + compile_command="$compile_command $flag" + finalize_command="$finalize_command $flag" + fi + elif test -n "$runpath_var"; then + # Do the same for the permanent run path. + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + + + case "$hardcode_action" in + immediate) + if test "$hardcode_direct" = no; then + compile_command="$compile_command $dir/$linklib" + elif test "$hardcode_minus_L" = no; then + compile_command="$compile_command -L$dir -l$name" + elif test "$hardcode_shlibpath_var" = no; then + compile_shlibpath="$compile_shlibpath$dir:" + compile_command="$compile_command -l$name" + fi + ;; + + relink) + # We need an absolute path. + case "$dir" in + /* | [A-Za-z]:\\*) ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + exit 1 + fi + dir="$absdir" + ;; + esac + + if test "$hardcode_direct" = yes; then + compile_command="$compile_command $dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + compile_command="$compile_command -L$dir -l$name" + elif test "$hardcode_shlibpath_var" = yes; then + compile_shlibpath="$compile_shlibpath$dir:" + compile_command="$compile_command -l$name" + fi + ;; + + *) + $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2 + exit 1 + ;; + esac + + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes; then + finalize_command="$finalize_command $libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + finalize_command="$finalize_command -L$libdir -l$name" + elif test "$hardcode_shlibpath_var" = yes; then + finalize_shlibpath="$finalize_shlibpath$libdir:" + finalize_command="$finalize_command -l$name" + else + # We cannot seem to hardcode it, guess we'll fake it. + finalize_command="$finalize_command -L$libdir -l$name" + fi + else + # Transform directly to old archives if we don't build new libraries. + if test -n "$pic_flag" && test -z "$old_library"; then + $echo "$modename: cannot find static library for \`$arg'" 1>&2 + exit 1 + fi + + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_command="$compile_command $dir/$linklib" + finalize_command="$finalize_command $dir/$linklib" + else + compile_command="$compile_command -L$dir -l$name" + finalize_command="$finalize_command -L$dir -l$name" + fi + fi + + # Add in any libraries that this one depends upon. + compile_command="$compile_command$dependency_libs" + finalize_command="$finalize_command$dependency_libs" + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case "$arg" in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + ;; + esac + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + fi + done + + if test -n "$prev"; then + $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + if test -n "$vinfo" && test -n "$release"; then + $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + oldlib= + oldobjs= + case "$output" in + "") + $echo "$modename: you must specify an output file" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + + */* | *\\*) + $echo "$modename: output file \`$output' must have no directory components" 1>&2 + exit 1 + ;; + + *.a) + # Now set the variables for building old libraries. + build_libtool_libs=no + build_old_libs=yes + oldlib="$output" + $show "$rm $oldlib" + $run $rm $oldlib + ;; + + *.la) + # Make sure we only generate libraries of the form `libNAME.la'. + case "$output" in + lib*) ;; + *) + $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac + + name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + eval libname=\"$libname_spec\" + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + current=0 + revision=0 + age=0 + + if test -n "$objs"; then + $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 + exit 1 + fi + + # How the heck are we supposed to write a wrapper for a shared library? + if test -n "$link_against_libtool_libs"; then + $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2 + exit 1 + fi + + if test -n "$dlfiles$dlprefiles"; then + $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2 + # Nullify the symbol file. + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi + + if test -z "$rpath"; then + $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + set dummy $rpath + if test $# -gt 2; then + $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 + fi + install_libdir="$2" + + # Parse the version information argument. + IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' + set dummy $vinfo + IFS="$save_ifs" + + if test -n "$5"; then + $echo "$modename: too many parameters to \`-version-info'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + test -n "$2" && current="$2" + test -n "$3" && revision="$3" + test -n "$4" && age="$4" + + # Check that each of the things are valid numbers. + case "$current" in + 0 | [1-9] | [1-9][0-9]*) ;; + *) + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + case "$revision" in + 0 | [1-9] | [1-9][0-9]*) ;; + *) + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + case "$age" in + 0 | [1-9] | [1-9][0-9]*) ;; + *) + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + if test $age -gt $current; then + $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + fi + + # Calculate the version variables. + version_vars="version_type current age revision" + case "$version_type" in + none) ;; + + linux) + version_vars="$version_vars major versuffix" + major=`expr $current - $age` + versuffix="$major.$age.$revision" + ;; + + osf) + version_vars="$version_vars versuffix verstring" + major=`expr $current - $age` + versuffix="$current.$age.$revision" + verstring="$versuffix" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test $loop != 0; do + iface=`expr $current - $loop` + loop=`expr $loop - 1` + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + verstring="$verstring:${current}.0" + ;; + + sunos) + version_vars="$version_vars major versuffix" + major="$current" + versuffix="$current.$revision" + ;; + + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit 1 + ;; + esac + + # Create the output directory, or remove our outputs if we need to. + if test -d $objdir; then + $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*" + $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.* + else + $show "$mkdir $objdir" + $run $mkdir $objdir + status=$? + if test $status -eq 0 || test -d $objdir; then : + else + exit $status + fi + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + # Add libc to deplibs on all systems. + dependency_libs="$deplibs" + deplibs="$deplibs -lc" + + if test "$build_libtool_libs" = yes; then + # Get the real and link names of the library. + eval library_names=\"$library_names_spec\" + set dummy $library_names + realname="$2" + shift; shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + lib="$objdir/$realname" + for link + do + linknames="$linknames $link" + done + + # Use standard objects if they are PIC. + test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` + + # Do each of the archive commands. + eval cmds=\"$archive_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + # Create links to the real library. + for linkname in $linknames; do + $show "(cd $objdir && $LN_S $realname $linkname)" + $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $? + done + + # If -export-dynamic was specified, set the dlname. + if test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + + # Now set the variables for building old libraries. + oldlib="$objdir/$libname.a" + ;; + + *.lo | *.o) + if test -n "$link_against_libtool_libs"; then + $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2 + exit 1 + fi + + if test -n "$deplibs"; then + $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2 + fi + + if test -n "$dlfiles$dlprefiles"; then + $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2 + # Nullify the symbol file. + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi + + if test -n "$rpath"; then + $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2 + fi + + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 + fi + + case "$output" in + *.lo) + if test -n "$objs"; then + $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 + exit 1 + fi + libobj="$output" + obj=`$echo "X$output" | $Xsed -e 's/\.lo$/.o/'` + ;; + *) + libobj= + obj="$output" + ;; + esac + + # Delete the old objects. + $run $rm $obj $libobj + + # Create the old-style object. + reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` + + output="$obj" + eval cmds=\"$reload_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + # Exit if we aren't doing a library object file. + test -z "$libobj" && exit 0 + + if test "$build_libtool_libs" != yes; then + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + $show "echo timestamp > $libobj" + $run eval "echo timestamp > $libobj" || exit $? + exit 0 + fi + + if test -n "$pic_flag"; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs" + output="$libobj" + eval cmds=\"$reload_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + else + # Just create a symlink. + $show "$LN_S $obj $libobj" + $run $LN_S $obj $libobj || exit 1 + fi + + exit 0 + ;; + + *) + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 + fi + + if test -n "$rpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + # Put the magic libdir with the hardcode flag. + hardcode_libdirs="$libdir" + libdir="@HARDCODE_LIBDIRS@" + else + # Just accumulate the unique libdirs. + case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + libdir= + fi + fi + + if test -n "$libdir"; then + eval flag=\"$hardcode_libdir_flag_spec\" + + compile_command="$compile_command $flag" + finalize_command="$finalize_command $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + done + fi + + # Substitute the hardcoded libdirs into the compile commands. + if test -n "$hardcode_libdir_separator"; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` + fi + + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$echo "X$compile_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` + finalize_command=`$echo "X$finalize_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` + fi + + if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then + dlsyms="${output}S.c" + else + dlsyms= + fi + + if test -n "$dlsyms"; then + # Add our own program objects to the preloaded list. + dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` + + # Discover the nlist of each of the dlfiles. + nlist="$objdir/${output}.nm" + + if test -d $objdir; then + $show "$rm $nlist ${nlist}T" + $run $rm "$nlist" "${nlist}T" + else + $show "$mkdir $objdir" + $run $mkdir $objdir + status=$? + if test $status -eq 0 || test -d $objdir; then : + else + exit $status + fi + fi + + for arg in $dlprefiles; do + $show "extracting global C symbols from \`$arg'" + $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + done + + # Parse the name list into a source file. + $show "creating $objdir/$dlsyms" + if test -z "$run"; then + # Make sure we at least have an empty file. + test -f "$nlist" || : > "$nlist" + + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + wcout=`wc "$nlist" 2>/dev/null` + count=`echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` + (test "$count" -ge 0) 2>/dev/null || count=-1 + else + $rm "$nlist"T + count=-1 + fi + + case "$dlsyms" in + "") ;; + *.c) + $echo > "$objdir/$dlsyms" \ +"/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */ +/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +/* Prevent the only kind of declaration conflicts we can make. */ +#define dld_preloaded_symbol_count some_other_symbol +#define dld_preloaded_symbols some_other_symbol + +/* External symbol declarations for the compiler. */" + + if test -f "$nlist"; then + sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms" + else + echo '/* NONE */' >> "$objdir/$dlsyms" + fi + + $echo >> "$objdir/$dlsyms" \ +" +#undef dld_preloaded_symbol_count +#undef dld_preloaded_symbols + +#if defined (__STDC__) && __STDC__ +# define __ptr_t void * +#else +# define __ptr_t char * +#endif + +/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ +int dld_preloaded_symbol_count = $count; + +/* The mapping between symbol names and symbols. */ +struct { + char *name; + __ptr_t address; +} +dld_preloaded_symbols[] = +{" + + if test -f "$nlist"; then + sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms" + fi + + $echo >> "$objdir/$dlsyms" \ +" {0, (__ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif" + ;; + + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 + exit 1 + ;; + esac + fi + + # Now compile the dynamic symbol file. + $show "(cd $objdir && $CC -c$no_builtin_flag \"$dlsyms\")" + $run eval '(cd $objdir && $CC -c$no_builtin_flag "$dlsyms")' || exit $? + + # Transform the symbol file into the correct name. + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` + elif test "$export_dynamic" != yes; then + test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2 + else + # We keep going just in case the user didn't refer to + # dld_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 + + # Nullify the symbol file. + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi + + if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then + # Replace the output file specification. + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + + # We have no uninstalled library dependencies, so finalize right now. + $show "$compile_command" + $run eval "$compile_command" + exit $? + fi + + # Replace the output file specification. + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'%g'` + finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'` + + # Create the binary in the object directory, then wrap it. + if test -d $objdir; then : + else + $show "$mkdir $objdir" + $run $mkdir $objdir + status=$? + if test $status -eq 0 || test -d $objdir; then : + else + exit $status + fi + fi + + if test -n "$shlibpath_var"; then + # We should set the shlibpath_var + rpath= + for dir in $temp_rpath; do + case "$dir" in + /* | [A-Za-z]:\\*) + # Absolute path. + rpath="$rpath$dir:" + ;; + *) + # Relative path: add a thisdir entry. + rpath="$rpath\$thisdir/$dir:" + ;; + esac + done + temp_rpath="$rpath" + fi + + # Delete the old output file. + $run $rm $output + + if test -n "$compile_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command" + finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command" + fi + + case "$hardcode_action" in + relink) + # AGH! Flame the AIX and HP-UX people for me, will ya? + $echo "$modename: warning: using a buggy system linker" 1>&2 + $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2 + ;; + esac + + $show "$compile_command" + $run eval "$compile_command" || exit $? + + # Now create the wrapper script. + $show "creating $output" + + # Quote the finalize command for shipping. + finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"` + + # Quote $echo for shipping. + qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` + + # Only actually do things if our run command is non-null. + if test -z "$run"; then + $rm $output + trap "$rm $output; exit 1" 1 2 15 + + $echo > $output \ +"#! /bin/sh + +# $output - temporary wrapper script for $objdir/$output +# Generated by ltmain.sh - GNU $PACKAGE $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of \``pwd`'. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e s/^X//' +sed_quote_subst='$sed_quote_subst' + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + link_against_libtool_libs='$link_against_libtool_libs' + finalize_command=\"$finalize_command\" +else + # When we are sourced in execute mode, \$file and \$echo are already set. + if test \"\$libtool_execute_magic\" = \"$magic\"; then : + else + echo=\"$qecho\" + file=\"\$0\" + fi + + # Find the directory that this script lives in. + thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` + done + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" + + progdir=\"\$thisdir/$objdir\" + program='$output' + + if test -f \"\$progdir/\$program\"; then" + + # Export our shlibpath_var if we have one. + if test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $echo >> $output \ +" # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\` + + export $shlibpath_var +" + fi + + echo >> $output \ +" if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + + # Export the path to the program. + PATH=\"\$progdir:\$PATH\" + export PATH + + exec \$program \${1+\"\$@\"} + + \$echo \"\$0: cannot exec \$program \$@\" + exit 1 + fi + else + # The program doesn't exist. + \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 + \$echo \"This script is just a wrapper for \$program.\" 1>&2 + echo \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi" + chmod +x $output + fi + exit 0 + ;; + esac + + # See if we need to build an old-fashioned archive. + if test "$build_old_libs" = "yes"; then + # Transform .lo files to .o files. + oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + eval cmds=\"$old_archive_from_new_cmds\" + else + eval cmds=\"$old_archive_cmds\" + fi + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + fi + + # Now create the libtool archive. + case "$output" in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.a" + + $show "creating $output" + + # Only create the output if not a dry run. + if test -z "$run"; then + echo > $output \ +"# $output - a libtool library file +# Generated by ltmain.sh - GNU $PACKAGE $VERSION + +# The name that we can dlopen(3). +dlname='$dlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + fi + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + $show "(cd $objdir && $LN_S ../$output $output)" + $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1 + ;; + esac + exit 0 + ;; + + # libtool install mode + install) + modename="$modename: install" + + # There may be an optional /bin/sh argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL"; then + # Aesthetically quote it. + arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` + case "$arg" in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + install_prog="$arg " + arg="$1" + shift + else + install_prog= + arg="$nonopt" + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case "$arg" in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + install_prog="$install_prog$arg" + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir= + stripme= + for arg + do + if test -n "$dest"; then + files="$files $dest" + dest="$arg" + continue + fi + + case "$arg" in + -d) isdir=yes ;; + -f) prev="-f" ;; + -g) prev="-g" ;; + -m) prev="-m" ;; + -o) prev="-o" ;; + -s) + stripme=" -s" + continue + ;; + -*) ;; + + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + prev= + else + dest="$arg" + continue + fi + ;; + esac + + # Aesthetically quote the argument. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case "$arg" in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + install_prog="$install_prog $arg" + done + + if test -z "$install_prog"; then + $echo "$modename: you must specify an install program" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + if test -n "$prev"; then + $echo "$modename: the \`$prev' option requires an argument" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + if test -z "$files"; then + if test -z "$dest"; then + $echo "$modename: no file or destination specified" 1>&2 + else + $echo "$modename: you must specify a destination" 1>&2 + fi + $echo "$help" 1>&2 + exit 1 + fi + + # Strip any trailing slash from the destination. + dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` + + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test -n "$isdir"; then + destdir="$dest" + destname= + else + destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` + test "X$destdir" = "X$dest" && destdir=. + destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` + + # Not a directory, so check to see that there is only one file specified. + set dummy $files + if test $# -gt 2; then + $echo "$modename: \`$dest' is not a directory" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + fi + case "$destdir" in + /* | [A-Za-z]:\\*) ;; + *) + for file in $files; do + case "$file" in + *.lo) ;; + *) + $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case "$file" in + *.a) + # Do the static libraries later. + staticlibs="$staticlibs $file" + ;; + + *.la) + # Check to see that this really is a libtool archive. + if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : + else + $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + library_names= + old_library= + # If there is no directory component, then add one. + case "$file" in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) current_libdirs="$current_libdirs $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi + + dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/" + test "X$dir" = "X$file/" && dir= + dir="$dir$objdir" + + # See the names of the shared library. + set dummy $library_names + if test -n "$2"; then + realname="$2" + shift + shift + + # Install the shared library and build the symlinks. + $show "$install_prog $dir/$realname $destdir/$realname" + $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? + test "X$dlname" = "X$realname" && dlname= + + if test $# -gt 0; then + # Delete the old symlinks. + rmcmd="$rm" + for linkname + do + rmcmd="$rmcmd $destdir/$linkname" + done + $show "$rmcmd" + $run $rmcmd + + # ... and create new ones. + for linkname + do + test "X$dlname" = "X$linkname" && dlname= + $show "(cd $destdir && $LN_S $realname $linkname)" + $run eval "(cd $destdir && $LN_S $realname $linkname)" + done + fi + + if test -n "$dlname"; then + # Install the dynamically-loadable library. + $show "$install_prog $dir/$dlname $destdir/$dlname" + $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" + eval cmds=\"$postinstall_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + fi + + # Install the pseudo-library for information purposes. + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + $show "$install_prog $file $destdir/$name" + $run eval "$install_prog $file $destdir/$name" || exit $? + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + destfile="$destdir/$destfile" + fi + + # Deduce the name of the destination old-style object file. + case "$destfile" in + *.lo) + staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'` + ;; + *.o) + staticdest="$destfile" + destfile= + ;; + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac + + # Install the libtool object if requested. + if test -n "$destfile"; then + $show "$install_prog $file $destfile" + $run eval "$install_prog $file $destfile" || exit $? + fi + + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'` + + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi + exit 0 + ;; + + *) + # Do a test to see if this is really a libtool program. + if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then + link_against_libtool_libs= + finalize_command= + + # If there is no directory component, then add one. + case "$file" in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Check the variables that should have been set. + if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then + $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 + exit 1 + fi + + finalize=yes + for lib in $link_against_libtool_libs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + # If there is no directory component, then add one. + case "$lib" in + */* | *\\*) . $lib ;; + *) . ./$lib ;; + esac + fi + libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" + if test -z "$libdir"; then + $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2 + elif test -f "$libfile"; then : + else + $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 + finalize=no + fi + done + + if test "$hardcode_action" = relink; then + if test "$finalize" = yes; then + $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2 + $show "$finalize_command" + if $run eval "$finalize_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 + continue + fi + file="$objdir/$file"T + else + $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2 + fi + else + # Install the binary that we compiled earlier. + file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + $show "$install_prog$stripme $file $dest" + $run eval "$install_prog\$stripme \$file \$dest" || exit $? + ;; + esac + done + + for file in $staticlibs; do + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + + $show "$install_prog $file $oldlib" + $run eval "$install_prog \$file \$oldlib" || exit $? + + # Do each command in the postinstall commands. + eval cmds=\"$old_postinstall_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + done + + if test -n "$future_libdirs"; then + $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 + fi + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + test -n "$run" && current_libdirs=" -n$current_libdirs" + exec $SHELL $0 --finish$current_libdirs + exit 1 + fi + + exit 0 + ;; + + # libtool finish mode + finish) + modename="$modename: finish" + libdirs="$nonopt" + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done + + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + eval cmds=\"$finish_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" + done + IFS="$save_ifs" + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $run eval "$cmds" + fi + done + fi + + echo "------------------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + echo " $libdir" + done + echo + echo "To link against installed libraries in a given directory, LIBDIR," + echo "you must use the \`-LLIBDIR' flag during linking." + echo + echo " You will also need to do one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + echo " - use the \`$flag' linker flag" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo + echo "See any operating system documentation about shared libraries for" + echo "more information, such as the ld(1) and ld.so(8) manual pages." + echo "------------------------------------------------------------------------------" + exit 0 + ;; + + # libtool execute mode + execute) + modename="$modename: execute" + + # The first argument is the command name. + cmd="$nonopt" + if test -z "$cmd"; then + $echo "$modename: you must specify a COMMAND" 1>&2 + $echo "$help" + exit 1 + fi + + # Handle -dlopen flags immediately. + for file in $execute_dlfiles; do + if test -f "$file"; then : + else + $echo "$modename: \`$file' is not a file" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + dir= + case "$file" in + *.la) + # Check to see that this really is a libtool archive. + if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + # Read the libtool library. + dlname= + library_names= + + # If there is no directory component, then add one. + case "$file" in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" + continue + fi + + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "X$dir" = "X$file" && dir=. + + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit 1 + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "X$dir" = "X$file" && dir=. + ;; + + *) + $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case "$file" in + -*) ;; + *) + # Do a test to see if this is really a libtool program. + if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then + # If there is no directory component, then add one. + case "$file" in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Transform arg to wrapped name. + file="$progdir/$program" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` + args="$args \"$file\"" + done + + if test -z "$run"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + + # Now actually exec the command. + eval "exec \$cmd$args" + + $echo "$modename: cannot exec \$cmd$args" + exit 1 + else + # Display what would be done. + eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" + $echo "export $shlibpath_var" + $echo "$cmd$args" + exit 0 + fi + ;; + + # libtool uninstall mode + uninstall) + modename="$modename: uninstall" + rm="$nonopt" + files= + + for arg + do + case "$arg" in + -*) rm="$rm $arg" ;; + *) files="$files $arg" ;; + esac + done + + if test -z "$rm"; then + $echo "$modename: you must specify an RM program" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + for file in $files; do + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "X$dir" = "X$file" && dir=. + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + + rmfiles="$file" + + case "$name" in + *.la) + # Possibly a libtool archive, so verify it. + if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then + . $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + rmfiles="$rmfiles $dir/$n" + test "X$n" = "X$dlname" && dlname= + done + test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" + test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" + + $show "$rm $rmfiles" + $run $rm $rmfiles + + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + eval cmds=\"$postuninstall_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" + done + IFS="$save_ifs" + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. + eval cmds=\"$old_postuninstall_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" + done + IFS="$save_ifs" + fi + + # FIXME: should reinstall the best remaining shared library. + fi + ;; + + *.lo) + if test "$build_old_libs" = yes; then + oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'` + rmfiles="$rmfiles $dir/$oldobj" + fi + $show "$rm $rmfiles" + $run $rm $rmfiles + ;; + + *) + $show "$rm $rmfiles" + $run $rm $rmfiles + ;; + esac + done + exit 0 + ;; + + "") + $echo "$modename: you must specify a MODE" 1>&2 + $echo "$generic_help" 1>&2 + exit 1 + ;; + esac + + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 + exit 1 +fi # test -z "$show_help" + +# We need to display help for each of the modes. +case "$mode" in +"") $echo \ +"Usage: $modename [OPTION]... [MODE-ARG]... + +Provide generalized library-building support services. + +-n, --dry-run display commands without modifying any files + --features display configuration information and exit + --finish same as \`--mode=finish' + --help display this help message and exit + --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] + --quiet same as \`--silent' + --silent don't print informational messages + --version print version information + +MODE must be one of the following: + + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for +a more detailed description of MODE." + exit 0 + ;; + +compile) + $echo \ +"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. + +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; + +execute) + $echo \ +"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +This mode sets the library path environment variable according to \`-dlopen' +flags. + +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + +finish) + $echo \ +"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +Each LIBDIR is a directory that contains libtool libraries. + +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; + +install) + $echo \ +"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + +link) + $echo \ +"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to dld_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -static do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + +All other options (arguments beginning with \`-') are ignored. + +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only +library objects (\`.lo' files) may be specified, and \`-rpath' is required. + +If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar' +and \`ranlib'. + +If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is +created, otherwise an executable program is created." + ;; + +uninstall) + $echo +"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + +*) + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; +esac + +echo +$echo "Try \`$modename --help' for more information about other modes." + +exit 0 + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: diff --git a/make/Makefile.am b/make/Makefile.am index 0d81d57a8e..a494692720 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -1,6 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/make/Makefile.am.wild by bin/autowild -# Do not edit -# project LilyPond -- the musical typesetter +# Generated automatically by wild-perl 0.1# project LilyPond -- the musical typesetter # title zucht # file make/Makefile.am.dist # @@ -34,3 +32,5 @@ lilypond.spec: lilypond.spec.in ../VERSION %.lsm: %.lsm.in ../VERSION cat $< | $(SED_VERSION) | $(SED_DATE) > $@ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/make/Makefile.in b/make/Makefile.in index 11ccea30ef..fd0d1e7536 100644 --- a/make/Makefile.in +++ b/make/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./make/Makefile.am.wild by bin/autowild -# Do not edit -# project LilyPond -- the musical typesetter +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# project LilyPond -- the musical typesetter # title zucht # file make/Makefile.am.dist # @@ -54,12 +58,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -74,11 +80,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -166,25 +176,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -204,6 +215,9 @@ lilypond.spec: lilypond.spec.in ../VERSION %.lsm: %.lsm.in ../VERSION cat $< | $(SED_VERSION) | $(SED_DATE) > $@ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/make/Targets.make b/make/Targets.make index 9535aee6f1..20a1558b96 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -21,7 +21,7 @@ endif # platform specific variables, # -include ./$(depth)/make/out/Site.make +#include ./$(depth)/make/out/Site.make # # where to do this ? diff --git a/make/Variables.make b/make/Variables.make index 4e4aff1628..cab4ed184b 100644 --- a/make/Variables.make +++ b/make/Variables.make @@ -60,7 +60,7 @@ include-flower = $(depth)/flower/include rpm-sources = ${HOME}/rpms/SOURCES # -include $(makeout)/Configure_variables.make +#include $(makeout)/Configure_variables.make # user settings: # diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 86d7d36233..868e8f293c 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond Versie: -Inschrijf datum: 19MAR98 +Inschrijf datum: 24MAR98 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: diff --git a/make/lilypond.lsm b/make/lilypond.lsm index aa925a6563..241eb8b49e 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond Version: -Entered-date: 19MAR98 +Entered-date: 24MAR98 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music diff --git a/make/lilypond.spec b/make/lilypond.spec index 30799c5495..1d9ea56f92 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu make -C Documentation gifs make prefix="$RPM_BUILD_ROOT/usr" install %files -%doc BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc +%doc Documentation/AUTHORS.txt Documentation/CodingStyle.txt Documentation/INSTALL.txt Documentation/MANIFESTO.txt Documentation/PATCHES.txt Documentation/convert-mudela.txt Documentation/faq.txt Documentation/gnu-music.txt Documentation/index.txt Documentation/internals.txt Documentation/language.txt Documentation/lilypond.txt Documentation/links.txt Documentation/literature.txt Documentation/ly2dvi.txt Documentation/mi2mu.txt Documentation/mudela-book.txt Documentation/mutopia.txt Documentation/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README +%doc input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc %doc Documentation/out/lelie_logo.gif /usr/bin/convert-mudela /usr/bin/mudela-book diff --git a/mf/Makefile.am b/mf/Makefile.am index ff6334f3f6..49b93e3e3b 100644 --- a/mf/Makefile.am +++ b/mf/Makefile.am @@ -1,5 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/mf/Makefile.am.wild by bin/autowild -# Do not edit +# Generated automatically by wild-perl 0.1 # mf/Makefile.am.wild # subdir level: @@ -12,20 +11,13 @@ outdir = . # TEXFILES = dimen.tex dyn.tex -MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf +MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf MFDEPS = $(outdir)/mf.dep EXTRA_DIST = Makefile.am.wild Rules.make $(MFFILES) $(TEXFILES) TODO README FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf -lyout = $(depth)/init -texout = $(depth)/tex - -FONT_FILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf - -FET_FILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf - lyout = $(depth)/init texout = $(depth)/tex LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly)) @@ -47,10 +39,12 @@ localuninstall: for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done -rmdir $(MFDIR)/public/lilypond/ -include Rules.make +include $(srcdir)/Rules.make # dependencies: # include $(MFDEPS) # +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/mf/Makefile.am.wild b/mf/Makefile.am.wild index 63066e6485..b12f046b9c 100644 --- a/mf/Makefile.am.wild +++ b/mf/Makefile.am.wild @@ -17,13 +17,6 @@ EXTRA_DIST = Makefile.am.wild 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 - -FONT_FILES = $(wildcard *.mf) - -FET_FILES = $(wildcard feta-*.mf) - lyout = $(depth)/init texout = $(depth)/tex LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly)) @@ -45,7 +38,7 @@ localuninstall: for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done -rmdir $(MFDIR)/public/lilypond/ -include Rules.make +include $(srcdir)/Rules.make # dependencies: # diff --git a/mf/Makefile.in b/mf/Makefile.in index 65930ff5e1..fd41683281 100644 --- a/mf/Makefile.in +++ b/mf/Makefile.in @@ -1,11 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./mf/Makefile.am.wild by bin/autowild -# Do not edit +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 # mf/Makefile.am.wild # subdir level: @@ -50,12 +55,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -70,11 +77,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -96,20 +107,13 @@ outdir = . # TEXFILES = dimen.tex dyn.tex -MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf +MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf MFDEPS = $(outdir)/mf.dep EXTRA_DIST = Makefile.am.wild Rules.make $(MFFILES) $(TEXFILES) TODO README FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf -lyout = $(depth)/init -texout = $(depth)/tex - -FONT_FILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf - -FET_FILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf - lyout = $(depth)/init texout = $(depth)/tex LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly)) @@ -172,25 +176,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -218,13 +223,16 @@ localuninstall: for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done -rmdir $(MFDIR)/public/lilypond/ -include Rules.make +include $(srcdir)/Rules.make # dependencies: # include $(MFDEPS) # +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 315f49383d..de55a13d30 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -38,5 +38,6 @@ else: % input feta-eindelijk; % input feta-klef; % input feta-toevallig; - input feta-schrift; +% input feta-schrift; + input feta-slag; fi diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 9a08537316..56c36f18a3 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -544,4 +544,7 @@ fet_beginchar("Flageolet", "flageolet", "flageolet") draw z1..z2..z3..z4..cycle; fet_endchar; +input feta-slag; + fet_endgroup("scripts"); + diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index 8ee650e9ad..02f984975c 100644 --- a/mf/feta-sleur.mf +++ b/mf/feta-sleur.mf @@ -7,9 +7,11 @@ % & Han-Wen Nienhuys % -mode_setup; +% mode_setup; -% staffsize#=16pt#; +%% staffsize#=16pt#; +% interline#:=staffsize#/4; +% stafflinethickness#:=0.1interline#; pi:=3.14159; @@ -33,8 +35,6 @@ def atan(expr x) = % slur_b getslurcontrol /slur_indent exch def % -interline#:=staffsize#/4; -stafflinethickness#:=0.1interline#; sleur_pen#:=stafflinethickness#; slurheightlimit#:=staffsize#/2; % staffrulethickness 1.5 mul /slur_thick exch def @@ -48,38 +48,41 @@ sluralpha:=slurheightlimit#*pi/2; slurratio:=0.3333; slurbeta:=3/4*pi*slurratio/sluralpha; -def drawslur(expr dxs,dys,d) = +def draw_slur(expr dxs,dys,d) = + save x, y; + save b, dx, dy, indent; + dx#:=dxs*1pt#; + dy#:=dys*1pt#; + define_pixels(dx,dy); + b#:=length(dx#,dy#); + % ugh: huh? 2/5 + indent#:=2/5*sluralpha*atan(slurbeta*b#); + define_pixels(b,indent); + height:=indent*d; + z1=(0,0); + z2=(b,0); + z3=(indent,height); + z4=(b-indent,height); + z5=z4-(0,d*slurthick); + z6=z3-(0,d*slurthick); + path boogje; + boogje=z1..controls z3 and z4..z2..controls z5 and z6..cycle; + boogje:=boogje rotated angle(dxs,dys); + pickup pencircle scaled sleur_pen; + filldraw boogje; + show z1; + show z2; + show z3; + show z4; + show z5; + show z6; +enddef; + +def slurchar(expr dxs,dys,d) = beginchar(0,0,0,0) "Embedded mf"; - dx#:=dxs*1pt#; - dy#:=dys*1pt#; - define_pixels(dx,dy); - b#:=length(dx#,dy#); -% message "sluralpha: "&decimal (sluralpha); -% message "slurbeta: "&decimal (slurbeta); -% message "s*b: "&decimal (slurbeta*b#); -% indent#:=sluralpha*atan(slurbeta*b#); - % ugh: huh? 2/5 - indent#:=2/5*sluralpha*atan(slurbeta*b#); - define_pixels(b,indent); - height:=indent*d; - z1=(0,0); - z2=(b,0); - z3=(indent,height); - z4=(b-indent,height); - z5=z4-(0,d*slurthick); - z6=z3-(0,d*slurthick); - path boogje; - boogje=z1..controls z3 and z4..z2..controls z5 and z6..cycle; - boogje:=boogje rotated angle(dxs,dys); - pickup pencircle scaled sleur_pen; - filldraw boogje; - show z1; - show z2; - show z3; - show z4; - show z5; - show z6; - endchar; - enddef; + draw_slur(dxs,dys,d); + endchar; +enddef; + +% drawslur(10,10,1); -% draw_slur(10,10,1); diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am index 1747805821..54b91154cd 100644 --- a/mi2mu/Makefile.am +++ b/mi2mu/Makefile.am @@ -1,5 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/mi2mu/Makefile.am.wild by bin/autowild -# Do not edit +# Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for mi2mu # file mi2mu/Makefile.am.wild @@ -14,11 +13,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 -mi2mu_LDADD = -llily -lflower +# ugh -lfl bo lib/FlexLexer stuff +mi2mu_LDADD = -llily -lflower -lfl -mi2mu_LDFLAGS = -L../lib -L../flower +mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs -INCLUDES = -Iinclude -I../lib/include -I../flower/include +INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild VERSION TODO +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/mi2mu/Makefile.am.wild b/mi2mu/Makefile.am.wild index bb3dc4bd36..b4494f9436 100644 --- a/mi2mu/Makefile.am.wild +++ b/mi2mu/Makefile.am.wild @@ -12,11 +12,12 @@ bin_PROGRAMS = mi2mu mi2mu_SOURCES = $(wildcard *.cc) -mi2mu_LDADD = -llily -lflower +# ugh -lfl bo lib/FlexLexer stuff +mi2mu_LDADD = -llily -lflower -lfl -mi2mu_LDFLAGS = -L../lib -L../flower +mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs -INCLUDES = -Iinclude -I../lib/include -I../flower/include +INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild VERSION TODO diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in index 988f61e4d3..cf4257fcca 100644 --- a/mi2mu/Makefile.in +++ b/mi2mu/Makefile.in @@ -1,11 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./mi2mu/Makefile.am.wild by bin/autowild -# Do not edit +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for mi2mu # file mi2mu/Makefile.am.wild @@ -53,12 +58,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -73,11 +80,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -97,11 +108,12 @@ bin_PROGRAMS = mi2mu mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc -mi2mu_LDADD = -llily -lflower +# ugh -lfl bo lib/FlexLexer stuff +mi2mu_LDADD = -llily -lflower -lfl -mi2mu_LDFLAGS = -L../lib -L../flower +mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs -INCLUDES = -Iinclude -I../lib/include -I../flower/include +INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include EXTRA_DIST = Makefile.am.wild VERSION TODO mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -119,7 +131,8 @@ mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o template.o \ version.o mi2mu_DEPENDENCIES = CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in TODO @@ -132,7 +145,7 @@ OBJECTS = $(mi2mu_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mi2mu/Makefile @@ -144,7 +157,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -155,13 +168,13 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -169,21 +182,48 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + mi2mu: $(mi2mu_OBJECTS) $(mi2mu_DEPENDENCIES) @rm -f mi2mu $(CXXLINK) $(mi2mu_LDFLAGS) $(mi2mu_OBJECTS) $(mi2mu_LDADD) $(LIBS) .cc.o: $(CXXCOMPILE) -c $< +.cc.lo: + $(LTCXXCOMPILE) -c $< # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -198,7 +238,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -208,7 +248,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -222,24 +264,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -254,15 +301,15 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -main.o main.lo: main.cc ../flower/include/string-convert.hh \ +main.o: main.cc ../flower/include/string-convert.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -282,10 +329,10 @@ main.o main.lo: main.cc ../flower/include/string-convert.hh \ include/midi-parser.hh include/mi2mu-proto.hh \ ../flower/include/parray.hh include/mudela-item.hh \ include/mudela-score.hh -mi2mu-version.o mi2mu-version.lo: mi2mu-version.cc ../lib/config.hh -midi-parser.o midi-parser.lo: midi-parser.cc \ - ../flower/include/string-convert.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/string.hh \ +mi2mu-version.o: mi2mu-version.cc ../lib/config.hh +midi-parser.o: midi-parser.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -293,9 +340,8 @@ midi-parser.o midi-parser.lo: midi-parser.cc \ include/mi2mu-global.hh include/midi-parser.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/mi2mu-proto.hh -midi-score-parser.o midi-score-parser.lo: midi-score-parser.cc \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +midi-score-parser.o: midi-score-parser.cc ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../lib/include/source-file.hh ../lib/include/proto.hh \ @@ -312,7 +358,7 @@ midi-score-parser.o midi-score-parser.lo: midi-score-parser.cc \ include/midi-track-parser.hh include/mudela-item.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/mudela-score.hh -midi-track-parser.o midi-track-parser.lo: midi-track-parser.cc \ +midi-track-parser.o: midi-track-parser.cc \ ../flower/include/string-convert.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -331,18 +377,18 @@ midi-track-parser.o midi-track-parser.lo: midi-track-parser.cc \ ../lib/include/plet.hh include/mudela-score.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ include/mudela-staff.hh -mudela-column.o mudela-column.lo: mudela-column.cc \ - include/mudela-column.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/mi2mu-proto.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh ../flower/include/compare.hh \ +mudela-column.o: mudela-column.cc include/mudela-column.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/mi2mu-proto.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \ +mudela-item.o: mudela-item.cc include/mi2mu-global.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -360,7 +406,7 @@ mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/mudela-item.hh include/mudela-stream.hh \ include/mudela-score.hh ../flower/include/parray.hh -mudela-score.o mudela-score.lo: mudela-score.cc ../lib/include/moment.hh \ +mudela-score.o: mudela-score.cc ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -378,7 +424,7 @@ mudela-score.o mudela-score.lo: mudela-score.cc ../lib/include/moment.hh \ include/mudela-item.hh include/mudela-score.hh \ ../flower/include/parray.hh include/mudela-staff.hh \ include/mudela-stream.hh -mudela-staff.o mudela-staff.lo: mudela-staff.cc ../lib/include/moment.hh \ +mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -397,8 +443,8 @@ mudela-staff.o mudela-staff.lo: mudela-staff.cc ../lib/include/moment.hh \ include/mudela-staff.hh include/mudela-stream.hh \ include/mudela-voice.hh include/mudela-score.hh \ ../flower/include/parray.hh -mudela-stream.o mudela-stream.lo: mudela-stream.cc \ - include/mi2mu-global.hh ../flower/include/string.hh \ +mudela-stream.o: mudela-stream.cc include/mi2mu-global.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -407,9 +453,9 @@ mudela-stream.o mudela-stream.lo: mudela-stream.cc \ include/mi2mu-proto.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/mudela-stream.hh -mudela-voice.o mudela-voice.lo: mudela-voice.cc \ - ../flower/include/string-convert.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/string.hh \ +mudela-voice.o: mudela-voice.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -424,7 +470,7 @@ mudela-voice.o mudela-voice.lo: mudela-voice.cc \ include/mudela-item.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/mudela-staff.hh \ include/mudela-stream.hh include/mudela-voice.hh -template.o template.lo: template.cc ../lib/include/proto.hh \ +template.o: template.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/list.hh ../flower/include/list.icc \ ../flower/include/cursor.hh ../flower/include/link.hh \ @@ -441,7 +487,7 @@ template.o template.lo: template.cc ../lib/include/proto.hh \ ../lib/include/plet.hh include/mudela-column.hh \ include/mudela-staff.hh include/mudela-voice.hh \ ../flower/include/plist.tcc -version.o version.lo: version.cc ../lib/include/proto.hh \ +version.o: version.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -479,38 +525,41 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + mostlyclean-libtool mostlyclean-tags \ + mostlyclean-generic -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ + clean-generic mostlyclean-am -distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-generic clean-am +distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ + distclean-tags distclean-generic clean-am maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-generic \ + distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @@ -519,7 +568,8 @@ maintainer-clean: maintainer-clean-recursive maintainer-clean-am .PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-data-recursive \ +maintainer-clean-compile mostlyclean-libtool distclean-libtool \ +clean-libtool maintainer-clean-libtool install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ @@ -532,6 +582,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am index fef16280ea..d1e752c9ea 100644 --- a/mi2mu/include/Makefile.am +++ b/mi2mu/include/Makefile.am @@ -1,8 +1,8 @@ -# Automatically generated from ./lilypond-0.1.49/mi2mu/include/Makefile.am.wild by bin/autowild -# Do not edit -# lib/include/Makefile.am.wild +# Generated automatically by wild-perl 0.1# lib/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 +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in index 33942a0b57..b9f1ba775b 100644 --- a/mi2mu/include/Makefile.in +++ b/mi2mu/include/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./mi2mu/include/Makefile.am.wild by bin/autowild -# Do not edit -# lib/include/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# lib/include/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -112,21 +122,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -165,25 +180,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean @@ -197,6 +213,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am index d76a839fe8..32de637184 100644 --- a/mutopia/J.S.Bach/Makefile.am +++ b/mutopia/J.S.Bach/Makefile.am @@ -1,6 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/mutopia/J.S.Bach/Makefile.am.wild by bin/autowild -# Do not edit -# mutopia/J.S.Bach/Makefile.am.wild +# Generated automatically by wild-perl 0.1# mutopia/J.S.Bach/Makefile.am.wild 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 @@ -11,3 +9,5 @@ OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in index 662106727f..e5f001379a 100644 --- a/mutopia/J.S.Bach/Makefile.in +++ b/mutopia/J.S.Bach/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./mutopia/J.S.Bach/Makefile.am.wild by bin/autowild -# Do not edit -# mutopia/J.S.Bach/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# mutopia/J.S.Bach/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -149,25 +159,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -181,6 +192,9 @@ mostlyclean distclean maintainer-clean default: all $(OUTFILES) +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am index a7f079fd79..f28215335e 100644 --- a/mutopia/Makefile.am +++ b/mutopia/Makefile.am @@ -1,6 +1,4 @@ -# Automatically generated from ./lilypond-0.1.49/mutopia/Makefile.am.wild by bin/autowild -# Do not edit -# mutopia/Makefile.am.wild +# Generated automatically by wild-perl 0.1# mutopia/Makefile.am.wild SUBDIRS = J.S.Bach @@ -12,3 +10,5 @@ EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) OUTFILES = $(M4FILES:%.m4=%) default: all $(OUTFILES) +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in index f933c9e672..d217c71a80 100644 --- a/mutopia/Makefile.in +++ b/mutopia/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./mutopia/Makefile.am.wild by bin/autowild -# Do not edit -# mutopia/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# mutopia/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -126,7 +136,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -136,7 +146,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -150,24 +162,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -182,11 +199,11 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done @@ -216,19 +233,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-tags mostlyclean-generic clean-am: clean-tags clean-generic mostlyclean-am @@ -243,7 +260,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @@ -262,6 +280,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean default: all $(OUTFILES) +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly index 32f0609dcc..a3d90b25de 100644 --- a/mutopia/standchen.ly +++ b/mutopia/standchen.ly @@ -467,19 +467,31 @@ tekstII = \lyric{ _ _ _ _ _ _ } + +$treble_staff = \type Staff = treble< + \commands + \melodie +> + +$bass_staff = \type Staff = bass< + \commands + \begeleiding +> -themusic = - < - \type Lyrics < - \tekstI - \tekstII - > - \type Grandstaff < - \melodic < \melodie \commands > - \melodic < \begeleiding \commands > - > - > +$grand_staff = \type Grandstaff< + \$treble_staff + \$bass_staff +> + +$lyric_staff = \type Lyrics = lyric< + \tekstI + \tekstII +> +themusic = < + \$lyric_staff + \$grand_staff +> \score{ \themusic diff --git a/mutopia/standje.ly b/mutopia/standje.ly index ce1681d9cd..d191707165 100644 --- a/mutopia/standje.ly +++ b/mutopia/standje.ly @@ -233,48 +233,70 @@ $bass_eentje = \melodic{ 'c8 <[e g> | } -global= \melodic {\meter 3 /4; \key bes es as; } +global = \melodic{ + \meter 3/4; + \key bes es as; +} + +lyrics = \melodic{ + \meter 3/4; + \skip 4 * 12; + \$lyric_verse1 + \skip 4 * 24; + \$lyric_verse2 +} +$lyric_staff = \type Lyrics = lyric< + \$lyrics +> +vocals = \melodic{ + \skip 4 * 12; + \$vocal_verse1 + \skip 4 * 24; + \$vocal_verse1 +} + +$vocal_staff = \type Staff = vocal< + \property Staff.instrument = "alto sax" + \$vocals +> + +% treble = \melodic{ +treble = { + \$treble_intro + \$treble_verse1 + \$treble_eentje + \$treble_verse1 +} + +$treble_staff = \type Staff = treble< + \global + \treble +> + +bass = \melodic{ + \$bass_intro + \$bass_verse1 + \$bass_eentje + \$bass_verse1 +} + +$bass_staff = \type Staff = bass< + \global + \bass +> + +$grand_staff = \type Grandstaff< + \$treble_staff + \$bass_staff +> + \score{ - \melodic< - \type Staff { < - \global - { - \property Staff.instrument = "alto sax" - \skip 4 * 12; - \$vocal_verse1 - \skip 4 * 24; - \$vocal_verse1 - } - > } - \type Lyrics { - \meter 3 /4; - \skip 4 * 12; - \$lyric_verse1 - \skip 4 * 24; - \$lyric_verse2 - } - \type Grandstaff < - < - \global - { - \$treble_intro - \$treble_verse1 - \$treble_eentje - \$treble_verse1 - } - > - < - \global - { - \$bass_intro - \$bass_verse1 - \$bass_eentje - \$bass_verse1 - } - > - > + < + \$vocal_staff + \$lyric_staff + \$grand_staff > \paper{ % how does this work? diff --git a/test/Makefile.in b/test/Makefile.in deleted file mode 100644 index c130f3c49e..0000000000 --- a/test/Makefile.in +++ /dev/null @@ -1,200 +0,0 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am - -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Automatically generated from ./flower/test/Makefile.am.wild by bin/autowild -# Do not edit -# -# project LilyPond -- the musical typesetter -# title makefile for flowertest -# file flower/test/Makefile.am.wild -# -# Copyright (c) 1997 by -# Jan Nieuwenhuizen -# Han-Wen Nienhuys -# - -# bin_PROGRAMS = test - -# TEST = test - -# can't link to libflower: has not been created yet... -# test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc - - -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 = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true -CC = @CC@ -CXX = @CXX@ -LIB_SUFFIX = @LIB_SUFFIX@ -MAKEINFO = @MAKEINFO@ -MODULE_CXXFLAGS = @MODULE_CXXFLAGS@ -MODULE_LDFLAGS = @MODULE_LDFLAGS@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -VERSION = @VERSION@ - -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) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) - tags=; \ - here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -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 - -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 - - -# 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/tex/Makefile.am b/tex/Makefile.am index 448561665e..ecad911115 100644 --- a/tex/Makefile.am +++ b/tex/Makefile.am @@ -1,11 +1,9 @@ -# Automatically generated from ./lilypond-0.1.49/tex/Makefile.am.wild by bin/autowild -# Do not edit -# tex/Makefile.am.wild +# Generated automatically by wild-perl 0.1# tex/Makefile.am.wild -TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) -CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex +CLEANFILES = install-data: $(INSTALL) -d $(TEXDIR)/lilypond @@ -14,3 +12,5 @@ install-data: uninstall-data: for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done -rmdir $(TEXDIR)/lilypond/ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/tex/Makefile.in b/tex/Makefile.in index 5e26aa35b2..209dac96d5 100644 --- a/tex/Makefile.in +++ b/tex/Makefile.in @@ -1,12 +1,16 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Automatically generated from ./tex/Makefile.am.wild by bin/autowild -# Do not edit -# tex/Makefile.am.wild +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generated automatically by wild-perl 0.1# tex/Makefile.am.wild SHELL = /bin/sh @@ -47,12 +51,14 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AUTOHEADER = @AUTOHEADER@ BISON = @BISON@ CC = @CC@ @@ -67,11 +73,15 @@ FIND = @FIND@ FLEX = @FLEX@ ICFLAGS = @ICFLAGS@ ILDFLAGS = @ILDFLAGS@ +LD = @LD@ LEX = @LEX@ +LIBTOOL = @LIBTOOL@ LN = @LN@ +LN_S = @LN_S@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MFDIR = @MFDIR@ +NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ POD2HTML = @POD2HTML@ @@ -85,10 +95,10 @@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ -TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) -CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex +CLEANFILES = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = @@ -147,25 +157,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @@ -184,6 +195,8 @@ install-data: uninstall-data: for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done -rmdir $(TEXDIR)/lilypond/ +$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tex/feta11.tex b/tex/feta11.tex deleted file mode 100644 index c1cea8ecbd..0000000000 --- a/tex/feta11.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta11.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - diff --git a/tex/feta13.tex b/tex/feta13.tex deleted file mode 100644 index 3378075a54..0000000000 --- a/tex/feta13.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta13.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - diff --git a/tex/feta16.tex b/tex/feta16.tex deleted file mode 100644 index 3c6195b295..0000000000 --- a/tex/feta16.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta16.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - diff --git a/tex/feta19.tex b/tex/feta19.tex deleted file mode 100644 index 492d5f13d2..0000000000 --- a/tex/feta19.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta19.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - diff --git a/tex/feta20.tex b/tex/feta20.tex deleted file mode 100644 index 8a90d6f5d6..0000000000 --- a/tex/feta20.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta20.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - diff --git a/tex/feta23.tex b/tex/feta23.tex deleted file mode 100644 index 592ce98f95..0000000000 --- a/tex/feta23.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta23.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - diff --git a/tex/feta26.tex b/tex/feta26.tex deleted file mode 100644 index 7173686dad..0000000000 --- a/tex/feta26.tex +++ /dev/null @@ -1,80 +0,0 @@ -% Creator: mf-to-table.py version 0.5 -% Automatically generated on -% Do not edit -% input from feta26.log -% name -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} -\fetdef\repeatcolon{16} - -% balls -\fetdef\brevisball{17} -\fetdef\brevisledger{18} -\fetdef\longaball{19} -\fetdef\longaledger{20} -\fetdef\wholeball{21} -\fetdef\wholeledger{22} -\fetdef\halfball{23} -\fetdef\halfledger{24} -\fetdef\quartball{25} -\fetdef\quartledger{26} - -% scripts -\fetdef\ufermata{27} -\fetdef\dfermata{28} -\fetdef\sforzatoaccent{29} -\fetdef\staccato{30} -\fetdef\ustaccatissimo{31} -\fetdef\dstaccatissimo{32} -\fetdef\tenuto{33} -\fetdef\umarcato{34} -\fetdef\dmarcato{35} -\fetdef\ouvert{36} -\fetdef\plusstop{37} -\fetdef\upbow{38} -\fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} - -% flags -\fetdef\eighthflag{47} -\fetdef\sixteenthflag{48} -\fetdef\thirtysecondflag{49} -\fetdef\sixtyfourthflag{50} -\fetdef\deighthflag{51} -\fetdef\dsixteenthflag{52} -\fetdef\dthirtysecondflag{53} -\fetdef\dsixtyfourthflag{54} - -% clefs -\fetdef\altoclef{55} -\fetdef\caltoclef{56} -\fetdef\bassclef{57} -\fetdef\cbassclef{58} -\fetdef\violinclef{59} -\fetdef\cviolinclef{60} - -- 2.39.2