From 598c9b198b95f5f0fbebad84f8128c12fe2d56e9 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:07:13 +0000 Subject: [PATCH] lilypond-0.1.50 --- configure.in | 33 ++++++++++++++++++++------------- lib/Makefile.am | 15 +++++++-------- lily/Makefile.am | 11 ++++++----- 3 files changed, 33 insertions(+), 26 deletions(-) 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/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/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 -- 2.39.5