lilypond-0.0.43

diff --git a/lib/Makefile b/lib/Makefile
index 8676c37760db960a4e65ff720875613ac9c673d6..497b93d8a880f3aea7c5d9da5231366e54ebc784 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -16,17 +16,13 @@ depth = ..
 # generic variables:
 #
 include ./$(depth)/make/Variables.make 
+include ./$(depth)/make/Files.make
+include ./$(depth)/make/Version.make 
 #
 
 # identify module:
 #
 NAME = lily
-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 = $(lily-dir)/$(outdir)/.build
 #
 
 # descent order into subdirectories:
@@ -39,24 +35,9 @@ SUBDIRS = include
 VERSION_DEPENDENCY =#
 #
 
-# list of c++ header files:
-# 
-HHFILES = $(shell ls *.hh $(ERROR_LOG))
-#
-
-# list of c++ source files:
-#
-CCFILES = $(shell ls *.cc $(ERROR_LOG))
-#
-
-# list of other source files:
-#
-EXTRA_SOURCE_FILES = # $(shell ls *.y *.l $(ERROR_LOG))
-#
-
 # list of distribution files:
 #
-DISTFILES = Makefile $(HHFILES) $(CCFILES) $(EXTRA_SOURCE_FILES)
+DISTFILES = Makefile $(ALL_SOURCES)
 #
 
 # list of custom libraries:
@@ -86,7 +67,7 @@ include ./$(depth)/make/Rules.make
 
 # list of depend files:
 #
-DEPFILES = $(shell ls $(depdir)/*.dep $(ERROR_LOG))
+
 #
 
 # auto dependencies:

diff --git a/make/Version.make b/make/Version.make
new file mode 100644 (file)
index 0000000..9ee3571
--- /dev/null
+++ b/make/Version.make
@@ -0,0 +1,7 @@
+
+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 = $(outdir)/.build

diff --git a/mi2mu/Makefile b/mi2mu/Makefile
index 10a7f1ef53e10f82a1d5e1dcc1b9c6f3655ae9f5..235504e66068f3710cbfd1436251579a99300204 100644 (file)
--- a/mi2mu/Makefile
+++ b/mi2mu/Makefile
@@ -15,7 +15,8 @@ depth = ..
 
 # generic variables:
 #
-include ./$(depth)/make/Variables.make 
+include ./$(depth)/make/Variables.make
+include ./$(depth)/make/Files.make 
 #
 
 # identify module:
@@ -36,24 +37,11 @@ SUBDIRS = include
 VERSION_DEPENDENCY = $(mi2mu-version)
 #
 
-# list of c++ header files:
-# 
-HHFILES := $(wildcard *.hh )
-#
-
-# list of c++ source files:
-#
-CCFILES := $(wildcard *.cc )
-#
-
-# list of other source files:
-#
-EXTRA_SOURCE_FILES := $(wildcard *.y *.l )
-#
 
 # list of distribution files:
 #
-DISTFILES = Makefile .version $(HHFILES) $(CCFILES) $(EXTRA_SOURCE_FILES)
+DISTFILES = Makefile .version $(ALL_SOURCES)
+
 #
 
 # list of custom libraries:
@@ -87,7 +75,7 @@ midi-lexer.l: $(outdir)/midi-parser.hh
 
 # list of depend files:
 #
-DEPFILES = $(shell ls $(depdir)/*.dep $(ERROR_LOG))
+DEPFILES = $(wildcard $(depdir)/*.dep)
 #
 
 # auto dependencies: