* make/mutopia-vars.make:

* make/ly-vars.make: Use src-wildcard iso wildcard for source
files.

diff --git a/ChangeLog b/ChangeLog
index 9376cd0884073c198ac7c3d4dbfbfc0a92140ba4..5d2815cd54d5c58d64f4c558f2df97d73fa3e2b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * make/mutopia-vars.make:
+       * make/ly-vars.make: Use src-wildcard iso wildcard for source
+       files.
+
 2005-11-13  Werner Lemberg  <wl@gnu.org>
 
        * mf/feta-arrow.mf: For all glyphs, don't mirror `currentpicture'
@@ -186,7 +192,7 @@
        * flower/file-path.cc (find): Bugfix: Return name of file found.
 
        * lily/main.cc (setup_paths): Bugfix for argv0 logic.
-       (setup_paths)[__CYGWIN__ || __MINGW32__ || ]: Normalize argv0.
+       (setup_paths)[__CYGWIN__ || __MINGW32__]: Normalize argv0.
        (setup_paths)[__MINGW32__]: Also look for argv0 + .exe.
 
 2005-11-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 9135bc4741aea4d599b52b4d12d7096e03c307ae..802c89b4ce42ca62ae71a4014a039e685ea2c739 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -3,14 +3,14 @@
 # empty
 
 # huh ? these are for documentation?!
-TELY_FILES := $(wildcard *.tely)
+TELY_FILES := $(call src-wildcard,*.tely)
 
 OMF_FILES += $(foreach format, html pdf ps.gz, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
 
-ITELY_FILES := $(wildcard *.itely)
-ITEXI_FILES := $(wildcard *.itexi)
-LY_FILES := $(wildcard *.ly)
-ILY_FILES := $(wildcard *.ily)
+ITELY_FILES := $(call src-wildcard,*.itely)
+ITEXI_FILES := $(call src-wildcard,*.itexi)
+LY_FILES := $(call src-wildcard,*.ly)
+ILY_FILES := $(call src-wildcard,*.ily)
 
 TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 

diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index fd05f5444dee59d46b7b04fc8fd441d3a763c16a..22c63ba39aa2d94ef08c983946419eaa8da2c05e 100644 (file)
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -4,11 +4,11 @@ include $(make-dir)/lilypond-vars.make
 
 # LY_FILES is defined the LY make template.
 
-SCORE_LY_FILES = $(shell fgrep -l score *.ly)
+SCORE_LY_FILES = $(shell cd $(src-dir) && fgrep -l score *.ly)
 
-M4_FILES = $(wildcard *.m4)
-LYM4_FILES = $(wildcard *.lym4)
-EXTRA_DIST_FILES +=  $(M4_FILES) $(LYM4_FILES)
+M4_FILES = $(call src-wildcard,*.m4)
+LYM4_FILES = $(call src-wildcard,*.lym4)
+EXTRA_DIST_FILES += $(M4_FILES) $(LYM4_FILES)
 
 ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
 all_examples=$(examples)