* stepmake/stepmake/generic-vars.make (DIST_FILES): Fix

src-wildcard, remove $(wildcard).

* po/GNUmakefile (PO_FILES):
* ps/GNUmakefile (PS_FILES):
* tex/GNUmakefile (TEX_FILES):
* cygwin/GNUmakefile (POSTINSTALLS):
* vim/GNUmakefile (EXTRA_DIST_FILES): Bugfix: [etags sr?] missed
some wildcard calls.

diff --git a/ChangeLog b/ChangeLog
index d194efd200fb7d0898e70727a47436f5c93a455b..a269eb38ec1aa8d1db71922faa9d8674ad6cfa3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-24  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/generic-vars.make (DIST_FILES): Fix
+       src-wildcard, remove $(wildcard).
+
+       * po/GNUmakefile (PO_FILES): 
+       * ps/GNUmakefile (PS_FILES): 
+       * tex/GNUmakefile (TEX_FILES): 
+       * cygwin/GNUmakefile (POSTINSTALLS):
+       * vim/GNUmakefile (EXTRA_DIST_FILES): Bugfix: [etags sr?] missed
+       some wildcard calls.
+
 2005-10-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * THANKS: add Thomas Bushnell.

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index 37b06524883f607937431f35fb9d49978484b7fa..7b53ec5766061874b2d4cffadb2f346b5ce9fabe 100644 (file)
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -2,8 +2,8 @@ depth = ..
 
 NAME = cygwin
 
-MKNETRELS = $(wildcard mknetrel mknetrel.*[a-z])
-EXTRA_DIST_FILES = changelog $(MKNETRELS) $(wildcard *.hint)
+MKNETRELS = mknetrel $(call src-wildcard,mknetrel.*[a-z])
+EXTRA_DIST_FILES = changelog $(MKNETRELS) $(call src-wildcard,*.hint)
 
 SEXECUTABLES=bug-lilypond-cygwin lily-wins
 STEPMAKE_TEMPLATES = install install-out script
@@ -15,7 +15,7 @@ ifneq ($(CYGWIN_BUILD),)
 
 include $(stepdir)/executable-targets.make
 
-POSTINSTALLS=$(wildcard postinstall*.sh)
+POSTINSTALLS=$(call src-wildcard,postinstall*.sh)
 OUT_POSTINSTALLS=$(POSTINSTALLS:%=$(outdir)/%)
 
 $(outdir)/%.sh: %.sh $(config_make)

diff --git a/po/GNUmakefile b/po/GNUmakefile
index bd0fcdc099ea72f9fb5683ae1f76f9795039d507..e6905f1b66606c5d0aba266d1cbbac915c312bad 100644 (file)
--- a/po/GNUmakefile
+++ b/po/GNUmakefile
@@ -6,8 +6,8 @@ depth = ..
 NAME = lilypond
 MODULE_NAME = po
 
-POT_FILES = $(wildcard *.pot)
-PO_FILES = $(wildcard *.po)
+POT_FILES = $(call src-wildcard,*.pot)
+PO_FILES = $(call src-wildcard,*.po)
 MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo))
 HELP_CATALOGS = $(PO_FILES:%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 

diff --git a/ps/GNUmakefile b/ps/GNUmakefile
index 1e99fd5f7e417ee64176f53ab3e0b86095233ad6..b7defdfefe8ff7318e911c7dff69e912f8e36129 100644 (file)
--- a/ps/GNUmakefile
+++ b/ps/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-PS_FILES = $(wildcard *.ps)
+PS_FILES = $(call src-wildcard,*.ps)
 
 STEPMAKE_TEMPLATES=install
 EXTRA_DIST_FILES = $(PS_FILES) 

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 48b1c90edefb680f4afb2a84e93d01456381e568..146d1d25b7eee8948cb2018d3d75f4d03aa84217 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -72,7 +72,7 @@ INCLUDES = $(src-dir)/include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES
 
 M4 = m4
 
-DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(src-wildcard,SConscript) $(wildcard SConscript)
+DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SConscript)
 DOCDIR=$(depth)/$(outdir)
 
 #?

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 0787a4a1dbfca069645289d5e024af0a410a8a42..ddc3a88094f4a6a9ac7cdf4cd1f055c21ee2ab34 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-TEX_FILES = $(filter-out texinfo.tex, $(wildcard *.tex))  
+TEX_FILES = $(filter-out texinfo.tex, $(call src-wildcard,*.tex))
 EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex texinfo.cnf
 STEPMAKE_TEMPLATES=install install-out
 

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 565b7c80e640e1e40723a847e487c416aa9471ed..03183df6a98ea92cd83f3e1c4c81d8ed462fa46b 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -4,7 +4,7 @@ INSTALLATION_OUT_DIR=$(vimdir)/syntax
 INSTALLATION_OUT_FILES=$(LILYPOND_WORDS)
 # $(outdir)/lilypond-words $(outdir)/lilypond-words.el
 
-EXTRA_DIST_FILES=$(wildcard *.vim) vimrc
+EXTRA_DIST_FILES=$(call src-wildcard,*.vim) vimrc
 
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\