lilypond-0.0.42

diff --git a/flower/Makefile b/flower/Makefile
index d01848f368a56b701892bc67e1a48f6fcae93836..a4ee94bd5ddbc4f66414c62754f70d04b1fe53a1 100644 (file)
--- a/flower/Makefile
+++ b/flower/Makefile
@@ -21,7 +21,7 @@ MODULE_NAME = flower
 # edit .version only
 include ./$(depth)/flower/.version
 include ./$(depth)/.version
-build = ./$(depth)/flower/lib/.build
+build = ./$(depth)/flower/$(outdir)/.build
 #
 
 # generic variables:
@@ -36,9 +36,9 @@ SUBDIRS = lib test
 
 # list of distribution files:
 #
-SCRIPTS = # make_version make_patch genheader clearlily configure
+SCRIPTS = 
 README_FILES = NEWS README TODO
-DISTFILES= Makefile .version $(README_FILES) $(SCRIPTS)
+DISTFILES= configure config.hh.in configure.in Makefile .version $(README_FILES) $(SCRIPTS)
 #
 
 # generic targets and rules:
@@ -49,8 +49,5 @@ include ./$(depth)/make/Rules.make
 
 # version:
 #
-flower-version: $(flower-dir)/$(genout) $(flower-version)
-$(flower-version): ./$(depth)/flower/.version ./$(bindir)/make_fversion $(build)
-       ./$(bindir)/make_fversion "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_LEVEL)" "$(MY_PATCH_LEVEL)" "$(BUILD)" "$(CXX) $(CXXVER)" > $@
-#
 
+localdist: configure

diff --git a/make/Initial.make b/make/Initial.make
index 444eb661ca62f431974640232542eb7a40913c4d..f2f5f9aecbab6a6933eba5a6e754e0eda734ef63 100644 (file)
--- a/make/Initial.make
+++ b/make/Initial.make
@@ -20,7 +20,7 @@ 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/.build
+build = ./$(depth)/lily/$(outdir)/.build
 #
 
 # generic variables:
@@ -31,7 +31,7 @@ include ./$(depth)/make/Variables.make
 
 # ugh
 # initdefault: $(CCDIR)/parser.cc $(CCDIR)/lexer.cc hdr/version.hh alldeps
-initdefault: check-flower-version $(lily-version) check-mi2mu-version dummydep
+initdefault: dummydep
 #      $(MAKE) -C ./$(depth)/lily $(outdir)/parser.cc
 
 # generic targets and rules:

diff --git a/make/Rules.make b/make/Rules.make
index e574fb4ee15786790310290df17cf43a01a07e28..1389ef4bd7253118d01f5c4c19607fb65b19b2ce 100644 (file)
--- a/make/Rules.make
+++ b/make/Rules.make
@@ -21,31 +21,34 @@
 
 # compile rules:
 #
-$(outdir)/%.o: %.cc $(genout)
+$(outdir)/%.o: %.cc
        $(DODEP)\
        $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION) 
 
-$(outdir)/%.cc: %.y $(genout)
+$(outdir)/%.cc: %.y
 #      $(BISON) -d $<
        $(BISON) $<
 #      mv $(shell basename $@ .cc ).tab.h $(include-lib)/$(shell basename $@ .cc).hh
 #      mv $(shell basename $@ .cc ).tab.h $(outdir)/$(shell basename $@ .cc).hh
        mv $(shell basename $@ .cc ).tab.c $@
 
-$(outdir)/%.hh: %.y $(genout)
+$(outdir)/%.hh: %.y
        $(BISON) -d $<
        mv $(shell basename $@ .hh ).tab.h $@
        mv $(shell basename $@ .hh ).tab.c $(outdir)/$(shell basename $@ .hh).cc
 
-$(outdir)/%.cc: %.l $(genout)
+$(outdir)/%.cc: %.l
        $(FLEX)  -t $< > $@
 
 $(outdir)/%.text: $(outdir)/%.1
        groff -man -Tascii $< > $@
 
-$(outdir)/%.1: %.pod $(genout)
+$(depth)/%.text: $(outdir)/%.text
+       cp $< $@
+
+$(outdir)/%.1: %.pod
        pod2man --center="LilyPond documentation" --section="0"\
-               --release="LilyPond $(MAJVER).$(MINVER).$(PATCHLEVEL)" $< > $@
+               --release="LilyPond $(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL)" $< > $@
 #
 
 # outdirs:
@@ -53,37 +56,25 @@ $(outdir)/%.1: %.pod $(genout)
 # ?$(outdir)/%.dep:
 %.dep:
        touch $@
-$(outdir):
-       mkdir $(outdir)
-       @touch $(genout)
-%/$(outdir):y
-       mkdir $@
-       @touch $(@D)/$(genout)
-$(genout):
-       mkdir $(outdir)
-       @touch $@
-%/$(genout):
-       mkdir $(@D)/$(outdir)
-       @touch $@
-#
+
 
 # build and config stuff: (could make this generic default rule...)
 #
 %/.build:
-       @echo 0 >$@
-$(flower-config): $(flower-dir)/$(genout)
-       touch $@
-$(lily-config): $(lib-dir)/$(genout)
-       @echo "#define LIBDIR \"./\"" >$@
-%.hh:
-       touch $@
-#
+       echo 0 >$@
+
 
 # specific stuff:
 #
-$(LIBFLOWER): check-flower-version
+$(LIBFLOWER): check-flower-deps
        $(MAKE) ./$(outdir)/$(@F) -C $(depth)/flower/lib
-#
+
+check-flower-deps:
+       $(MAKE)  -C $(depth)/flower/lib
+
+check-lily-deps: check-flower-deps
+       $(MAKE)  -C $(depth)/lib
+
 $(LIBLILY): dummy
        $(MAKE) ./$(outdir)/$(@F) -C $(depth)/lib
 #