lilypond-0.0.42

diff --git a/lily/Makefile b/lily/Makefile
index 2302cf627c92c612448253ac98d9818b7f63bef0..96a523cb95320ea83a70a7a25224d66e091c7adc 100644 (file)
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -26,7 +26,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 = $(lily-dir)/.build
+build = $(lily-dir)/$(outdir)/.build
 #
 
 # descent order into subdirectories:
@@ -41,12 +41,12 @@ VERSION_DEPENDENCY = $(lily-version)
 
 # list of c++ header files:
 # 
-HHFILES = $(shell ls *.hh $(ERROR_LOG))
+HHFILES := $(wildcard *.hh) #$(shell ls *.hh $(ERROR_LOG))
 #
 
 # list of c++ source files:
 #
-CCFILES = $(shell ls *.cc $(ERROR_LOG))
+CCFILES := $(wildcard *.cc) #$(shell ls *.cc $(ERROR_LOG))
 #
 
 # list of other source files:
@@ -56,7 +56,7 @@ EXTRA_SOURCE_FILES = $(shell ls *.y *.l $(ERROR_LOG))
 
 # list of distribution files:
 #
-DISTFILES = Makefile $(HHFILES) $(CCFILES) $(EXTRA_SOURCE_FILES)
+DISTFILES = .version Makefile $(HHFILES) $(CCFILES) $(EXTRA_SOURCE_FILES)
 #
 
 # list of custom libraries:
@@ -72,7 +72,7 @@ LOADLIBES +=
 #
 # MAINTARGET = $(EXECUTABLE)
 # MAINTARGET = $(LIBRARY)
-MAINTARGET = $(bindir)/$(EXECUTABLE)# huh?
+MAINTARGET = $(lily_bindir)/$(EXECUTABLE)# huh?
 # MAINTARGET = $(libdir)/$(LIBRARY)# huh?
 
 default: $(MAINTARGET)
@@ -87,7 +87,9 @@ include ./$(depth)/make/Rules.make
 # explicit dependencies: (how to do auto?)
 #
 # ugh
-$(outdir)/version.cc: check-flower-version $(lily-version)
+#$(outdir)/version.cc: check-flower-version $(lily-version)
+
+
 mylexer.cc: $(outdir)/parser.hh # sic
 lexer.l: $(outdir)/parser.hh
 #
@@ -99,6 +101,6 @@ DEPFILES = $(shell ls $(depdir)/*.dep $(ERROR_LOG))
 
 # auto dependencies:
 #
--include $(DEPFILES)
+-include /dev/null $(DEPFILES)
 #
 

diff --git a/mi2mu/Makefile b/mi2mu/Makefile
index 372695f7bd6fe3df96dd19be091431ab09e3fe75..10a7f1ef53e10f82a1d5e1dcc1b9c6f3655ae9f5 100644 (file)
--- a/mi2mu/Makefile
+++ b/mi2mu/Makefile
@@ -23,7 +23,7 @@ include ./$(depth)/make/Variables.make
 NAME = mi2mu
 MODULE_NAME = mi2mu
 include $(mi2mu-dir)/.version
-build = $(mi2mu-dir)/.build
+build = $(mi2mu-dir)/$(outdir)/.build
 #
 
 # descent order into subdirectories:
@@ -38,17 +38,17 @@ VERSION_DEPENDENCY = $(mi2mu-version)
 
 # list of c++ header files:
 # 
-HHFILES = $(shell ls *.hh $(ERROR_LOG))
+HHFILES := $(wildcard *.hh )
 #
 
 # list of c++ source files:
 #
-CCFILES = $(shell ls *.cc $(ERROR_LOG))
+CCFILES := $(wildcard *.cc )
 #
 
 # list of other source files:
 #
-EXTRA_SOURCE_FILES = $(shell ls *.y *.l $(ERROR_LOG))
+EXTRA_SOURCE_FILES := $(wildcard *.y *.l )
 #
 
 # list of distribution files:
@@ -69,7 +69,7 @@ LOADLIBES +=
 #
 # MAINTARGET = $(EXECUTABLE)
 # MAINTARGET = $(LIBRARY)
-MAINTARGET = $(bindir)/$(EXECUTABLE)# huh?
+MAINTARGET = $(lily_bindir)/$(EXECUTABLE)# huh?
 # MAINTARGET = $(libdir)/$(LIBRARY)# huh?
 
 default: $(MAINTARGET)
@@ -84,15 +84,6 @@ include ./$(depth)/make/Rules.make
 # explicit dependencies: (how to do auto?)
 #
 midi-lexer.l:  $(outdir)/midi-parser.hh
-version.cc:    check-flower-version $(mi2mu-version)
-#
-
-# version:
-#
-mi2mu-version: $(mi2mu-dir)/$(genout) $(mi2mu-version)
-$(mi2mu-version): $(mi2mu-dir)/$(genout) $(mi2mu-dir)/.version ./$(bindir)/make_version $(build)
-       ./$(bindir)/make_version "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_LEVEL)" "$(MY_PATCH_LEVEL)" "$(BUILD)" "$(CXX) $(CXXVER)" > $@
-#
 
 # list of depend files:
 #
@@ -101,6 +92,6 @@ DEPFILES = $(shell ls $(depdir)/*.dep $(ERROR_LOG))
 
 # auto dependencies:
 #
--include $(DEPFILES)
+-include /dev/null $(DEPFILES)
 #
 

diff --git a/mi2mu/include/Makefile b/mi2mu/include/Makefile
index cb4f4ea6d17bd88c5b0ee24fafa85d3f6cdabf5d..6860a29536f8e5ef4201924f05ec2efa1a4475c8 100644 (file)
--- a/mi2mu/include/Makefile
+++ b/mi2mu/include/Makefile
@@ -13,7 +13,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)/mi2mu/$(outdir)/.build
 #
 
 # generic stuff/Makefile