lilypond-0.0.43

diff --git a/Makefile b/Makefile
index 9c9f9b7737840bfcfc6b763183599a4dfc79319e..7ac03e335c42fc237ff8e70b40f7a20f9db90777 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,8 @@ depth = .
 # identify module:
 #
 NAME = lilypond
-
-# edit in .version only!
-MAJOR_VERSION = $(TOPLEVEL_MAJOR_VERSION)
-MINOR_VERSION = $(TOPLEVEL_MINOR_VERSION)
-PATCH_LEVEL = $(TOPLEVEL_PATCH_LEVEL)
-# use to send patches, always empty for released version:
-MY_PATCH_LEVEL = $(TOPLEVEL_MY_PATCH_LEVEL)
-build = ./$(depth)/lily/$(outdir)/.build
-#
+include .version
+include ./$(depth)/make/Version.make
 
 # generic variables:
 #
@@ -42,7 +35,7 @@ SUBDIRS = flower lib lily mi2mu \
 # SYMLINKS = # naah, configure
 SCRIPTS = configure configure.in install-sh
 README_FILES = ANNOUNCE COPYING NEWS README TODO INSTALL.text
-DISTFILES= Makefile .dstreamrc .version $(README_FILES) $(SCRIPTS) $(SYMLINKS)
+EXTRA_DISTFILES=  .dstreamrc .version $(README_FILES) $(SCRIPTS) $(SYMLINKS)
 #
 
 
@@ -55,9 +48,8 @@ include ./$(depth)/make/Rules.make
 localdist: configure
 
 # ugh. I know dep is not quite what is really needed.
-INSTALL.text: Documentation
+INSTALL.text: check-doc-deps
        rm -f INSTALL.text
-       $(MAKE) -C Documentation
        ln `find -name INSTALL.text|head -1` .
 
 localclean:

diff --git a/make/Rules.make b/make/Rules.make
index 1389ef4bd7253118d01f5c4c19607fb65b19b2ce..0e06b46cac9898b6daeeee727651a710edfde1d0 100644 (file)
--- a/make/Rules.make
+++ b/make/Rules.make
@@ -22,8 +22,10 @@
 # compile rules:
 #
 $(outdir)/%.o: %.cc
-       $(DODEP)\
-       $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION) 
+       $(DO_CXX_COMPILE)
+
+$(outdir)/%.o: $(outdir)/%.cc
+       $(DO_CXX_COMPILE)
 
 $(outdir)/%.cc: %.y
 #      $(BISON) -d $<
@@ -67,14 +69,16 @@ $(outdir)/%.1: %.pod
 # specific stuff:
 #
 $(LIBFLOWER): check-flower-deps
-       $(MAKE) ./$(outdir)/$(@F) -C $(depth)/flower/lib
 
 check-flower-deps:
-       $(MAKE)  -C $(depth)/flower/lib
+       $(MAKE)  -C $(depth)/flower/ $(outdir)/$(notdir $(LIBFLOWER))
 
 check-lily-deps: check-flower-deps
        $(MAKE)  -C $(depth)/lib
 
+check-doc-deps:
+       $(MAKE) -C $(depth)/Documentation
+
 $(LIBLILY): dummy
        $(MAKE) ./$(outdir)/$(@F) -C $(depth)/lib
 #