From: fred <fred>
Date: Sun, 24 Mar 2002 19:35:25 +0000 (+0000)
Subject: lilypond-0.0.43
X-Git-Tag: release/1.5.59~5183
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=682fb7191f3c93eb4e3ccf22c2dd7e9d9c68ba12;p=lilypond.git

lilypond-0.0.43
---

diff --git a/flower/test/Makefile b/flower/test/Makefile
index 14bf4b9916..5b6affe77e 100644
--- a/flower/test/Makefile
+++ b/flower/test/Makefile
@@ -19,12 +19,13 @@ NAME =stringtest
 # include ./$(depth)/$(NAME)/.version
 MODULE_NAME = flower
 include ./$(depth)/flower/.version
-build = ./$(depth)/flower/test/$(outdir)/.build
+
 #
 
 # generic variables:
 #
-include ./$(depth)/make/Variables.make 
+include ./$(depth)/make/Variables.make
+include ./$(depth)/make/Files.make 
 #
 
 # descent order into subdirectories:
@@ -40,29 +41,12 @@ VERSION_DEPENDENCY = #
 # module compile settings: (not generally needed!
 #
 EXTRA_CFLAGS = -DSTRING_TEST
-EXTRA_CXXFLAGS =
-EXTRA_LDFLAGS =
-#
-
-# 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)
-#
+EXTRA_DISTFILES = result 
 
 # list of custom libraries:
 #
@@ -82,9 +66,11 @@ MAINTARGET = $(lily_bindir)/$(EXECUTABLE)# huh?
 #default: $(MAINTARGET)
 BUILDSTRINGTEST=$(MAINTARGET)
 EXECSTRINGTEST=$(EXECUTABLE)
+
 default:  $(BUILDSTRINGTEST) do-stringtest
 do-stringtest:
-	$(EXECSTRINGTEST)    # should cmp with a 'standard result'
+	$(EXECSTRINGTEST) > $(outdir)/result    # should cmp with a 'standard result'
+	cmp $(outdir)/result result
 
 dummy:
 
@@ -96,7 +82,7 @@ include ./$(depth)/make/Rules.make
 
 # list of depend files:
 #
-DEPFILES = $(shell ls $(depdir)/*.dep $(ERROR_LOG))
+DEPFILES = $(wildcard $(depdir)/*.dep )
 #
 
 # auto dependencies:
diff --git a/init/Makefile b/init/Makefile
index 04fb51197d..c8fee3cd50 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -1,5 +1,6 @@
 # init/Makefile
 
+
 # subdir level:
 #
 depth = ..
@@ -9,12 +10,12 @@ build = ./$(depth)/lily/$(outdir)/.build
 
 # generic stuff/Makefile
 #
-include ./$(depth)/make/Stuff.make
+include ./$(depth)/make/Include.make
 #
 
 # list of distribution files:
 # 
-INIFILES = $(shell ls *.ini)
+INIFILES = $(wildcard *.ini)
 DISTFILES = Makefile $(INIFILES)
 #
 
diff --git a/mi2mu/include/Makefile b/mi2mu/include/Makefile
index 6860a29536..1cfdc7b22a 100644
--- a/mi2mu/include/Makefile
+++ b/mi2mu/include/Makefile
@@ -8,12 +8,6 @@ depth = ../..
 # identify module:
 #
 MODULE_NAME = lilypond
-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)/mi2mu/$(outdir)/.build
 #
 
 # generic stuff/Makefile
diff --git a/tex/Makefile b/tex/Makefile
index 35004f0f6d..adcbcdd157 100644
--- a/tex/Makefile
+++ b/tex/Makefile
@@ -4,17 +4,13 @@
 #
 depth = ..
 #
-
-build = ./$(depth)/lily/$(outdir)/.build
-
-# generic stuff/Makefile
 #
-include ./$(depth)/make/Stuff.make
+include ./$(depth)/make/Include.make
 #
 
 # list of distribution files:
 # 
-TEXFILES = $(shell ls *.tex)
+TEXFILES = $(wildcard *.tex)
 DISTFILES = Makefile $(TEXFILES)
 #
 
@@ -24,4 +20,4 @@ localinstall:
 
 localuninstall:
 	for i in $(TEXFILES) ; do rm -f $(TEXPREFIX)/lilypond/$$i; done
-	-rmdir $(TEXPREFIX)/lilypond/
\ No newline at end of file
+	-rmdir $(TEXPREFIX)/lilypond/