diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2005-10-24 07:39:36 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2005-10-24 07:39:36 +0000 |
| commit | 339ec2c5d3556ac255833d8cabc35fce6046be41 (patch) | |
| tree | ab8a07c3aa95c4bc42724f36abef99aa7623d6fe | |
| parent | 0da6a8b01ad03688809a07c2966d8eb5fcbcef21 (diff) | |
* 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.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | cygwin/GNUmakefile | 6 | ||||
| -rw-r--r-- | po/GNUmakefile | 4 | ||||
| -rw-r--r-- | ps/GNUmakefile | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/generic-vars.make | 2 | ||||
| -rw-r--r-- | tex/GNUmakefile | 2 | ||||
| -rw-r--r-- | vim/GNUmakefile | 2 |
7 files changed, 21 insertions, 9 deletions
@@ -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 37b0652488..7b53ec5766 100644 --- 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 bd0fcdc099..e6905f1b66 100644 --- 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 1e99fd5f7e..b7defdfefe 100644 --- 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 48b1c90ede..146d1d25b7 100644 --- 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 0787a4a1db..ddc3a88094 100644 --- 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 565b7c80e6..03183df6a9 100644 --- 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 =\ |