patch::: 0.1.48: Re: lily 0.1.59

[lilypond.git] / flower / Makefile

diff --git a/flower/Makefile b/flower/Makefile
index 6272c5f509f066ed67b1cd2a455952bcda1efbe5..c46fed65ebf02e981188f26ae75d7cbe7462d6ce 100644 (file)
--- a/flower/Makefile
+++ b/flower/Makefile
@@ -17,17 +17,18 @@ depth = ..
 #
 NAME = flower
 MODULE_NAME = flower
-include out/Flower-flags.make
 #
-# edit .version only
-include ./$(depth)/.version
-include ./$(depth)/flower/.version
+# edit VERSION only
+include ./$(depth)/VERSION
+include ./$(depth)/flower/VERSION
 
 # generic variables:
 #
 include ./$(depth)/make/Variables.make
 include ./$(depth)/make/Files.make 
 
+include $(flowerout)/Flower-flags.make
+
 
 #
 # descent order into subdirectories:
@@ -38,8 +39,8 @@ SUBDIRS = include test
 # list of distribution files:
 #
 SCRIPTS = 
-README_FILES = NEWS README TODO
-EXTRA_DISTFILES= configure config.hh.in configure.in .version $(README_FILES) $(SCRIPTS) Flower-flags.make.in
+README_FILES = ONEWS NEWS README TODO
+EXTRA_DISTFILES= aclocal.m4 configure config.hh.in configure.in VERSION $(README_FILES) $(SCRIPTS) Flower-flags.make.in
 #
 
 
@@ -48,9 +49,11 @@ EXTRA_DISTFILES= configure config.hh.in configure.in .version $(README_FILES) $(
 include ./$(depth)/make/Targets.make
 include ./$(depth)/make/Rules.make
 #
-default: shared-lib
 
-shared-lib: $(SHAREDLIBRARY) 
+default: the-lib
+
+THE_LIB=$(outdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX)
+the-lib: $(THE_LIB) 
 
 # version:
 #
@@ -61,12 +64,18 @@ localdist: configure
 #
 
 localdistclean:
-       rm -f config.cache config.status
+       rm -f config.cache config.status config.log
 
 localinstall: $(LIBFLOWER)
+ifeq ($(LIB_SUFFIX),.so)
        $(INSTALL) -d $(libdir)
-       $(INSTALL) $(LIBFLOWER) $(libdir)
-#      ln -s $(libdir)/libflower.so.$(VERSION) $(libdir
+       $(INSTALL) $(LIBFLOWER).$(VERSION) $(libdir)
+       ln -sf $(LIB_PREFIX)flower$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX).$(MAJOR_VERSION)
+       ln -sf $(LIB_PREFIX)flower$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX)
+endif
 
 localuninstall:
-       rm -f $(libdir)/libflower.{so,a}
+       rm -f $(libdir)/libflower.{so*,a}
+
+
+$(outdir)/flower-version.o: $(outdir)/version.hh