fi
AM_INIT_AUTOMAKE(lilypond, $FULL_VERSION)
-#AC_PROG_CC
-#AC_PROG_CXX
+. $srcdir/flower/VERSION
+FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+
+# libtool.info ...
+# **Never** try to set library version numbers so that they correspond
+# to the release number of your package. This is an abuse that only
+# fosters misunderstanding of the purpose of library versions.
+
+REVISION=$PATCH_LEVEL
+# CURRENT=$MINOR_VERSION
+CURRENT=`expr $MINOR_VERSION + 1`
+# AGE=$(expr $MAJOR_VERSION + 1)
+AGE=$MAJOR_VERSION
+AC_SUBST(CURRENT)
+AC_SUBST(REVISION)
+AC_SUBST(AGE)
# turn off shared libraries by default (may be enabled using --enable-shared)
AM_DISABLE_SHARED
fi
if test "$optimise_b" = yes; then
-# DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+ DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
AC_DEFINE(STRINGS_UTILS_INLINED)
fi
-# oeps, broken for now
if test $profile_b = yes; then
EXTRA_LIBES="-pg"
DEFINES="$DEFINES -pg"
dnl COMPILEINFO="$HOST $host $TARGET $target"
AUTOGENERATE="This file was automatically generated by configure"
CPPFLAGS=${CPPFLAGS:-""} # we don't want -g -O junk
-CXXFLAGS=${CXXFLAGS:-""} # we don't want -g -O junk
+# CXXFLAGS=${CXXFLAGS:-""} # we don't want -g -O junk
+CXXFLAGS=$DEFINES
+LDFLAGS=$EXTRA_LIBES
AC_PROG_CXX
# AC_PROG_RANLIB
AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
# ugh: produces "${prefix}/share/lilypond"
# DIR_DATADIR=$datadir/lilypond
# ugh: produces "NONE/share/lilypond"
AC_SUBST(CXXFLAGS)
AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
AC_SUBST(CXX)
AC_SUBST(ICFLAGS)
AC_SUBST(ILDFLAGS)
-AC_SUBST(DEFINES)
+# AC_SUBST(DEFINES)
AC_SUBST(COMPILEINFO)
AC_SUBST(AUTOGENERATE)
AC_SUBST(BISON)
AC_CHECK_HEADER(FlexLexer.h, true,
AC_LILY_WARN(can't find flex header. Please install Flex headers correctly))
-AC_CONFIG_SUBDIRS(flower)
-
-touch lib/stamp-h.in
-# AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in)
-AM_CONFIG_HEADER(lib/config.hh:config.hh.in)
+touch stamp-h.in
+AM_CONFIG_HEADER(flower/config.hh:config.hh.in)
# first do Foobar/Makefile then Foobar/include/Makefile
-AC_OUTPUT(bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile
- lily/include/Makefile mf/Makefile mi2mu/Makefile
+AC_OUTPUT(bin/Makefile flower/Makefile flower/include/Makefile
+ flowertest/Makefile lib/Makefile lib/include/Makefile
+ lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
mi2mu/include/Makefile debian/Makefile Documentation/Makefile
init/Makefile input/Makefile tex/Makefile make/Makefile
- mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile bin/add-URLs
- bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily
- bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader
- bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch
- bin/make-version bin/make-website bin/mf-deps bin/mf-to-table
- bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest)
+ mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile
+ bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts
+ bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo
+ bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples
+ bin/make-patch bin/make-version bin/make-website bin/mf-deps
+ bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release
+ bin/show-latest)
# ugh
chmod 755 bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest