lilypond-0.1.50

diff --git a/flower/Makefile.am b/flower/Makefile.am
index e0446e0081e3c4eb03e0523e2ac644486c22c04d..c91e9337ab6477fd46280a50c519516febd731d4 100644 (file)
--- 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 f19c6ab501f73e12a4fd5cfe74a02f94fe23730f..8a4af490095e0d7b910795f8f6669bc4e15f1da2 100644 (file)
--- 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/configure.in b/flower/configure.in
index 4c28402072db1c76d508aa9336e01bffb9870744..6680ebd9f0d99dcf16de6a056c5c36dd7af22608 100644 (file)
--- 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 )