diff options
| author | Cyril Brulebois <kibi@debian.org> | 2019-03-11 00:36:30 +0000 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2019-03-11 01:33:54 +0000 |
| commit | 35e5a08057ab8953dcfaceab9f623c52be7a44e4 (patch) | |
| tree | fe1626fe132cc5f38dc6c94269f2008fbca0381e /Makefile.common | |
| parent | e0496a1974f81c11d576b507c2c2a1d39538d44e (diff) | |
Reduce entropy by sorting the output of all $(wildcard …) calls
Introducing a function (i.e. sorted_wildcard) seemed to make sense at
first but it would need to be defined in all Makefiles, before getting
used. That's why a “replace all occurrences” approach was preferred in
the end.
Many occurrences aren't going to make a difference anyway, because they
are about documenting target dependencies. But replacing everything
means it's easier to check later on, in case entropy comes back.
This file needs a slightly different diff because the Makefile snippet
is embedded in a Perl script: english/security/parse-advisory.pl
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index cf45e560073..a01a8aef20e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -52,7 +52,7 @@ WMLPROLOG := WMLEPILOG := WML = wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE)@g+w $(WMLPROLOG) $(WMLEPILOG) -WMLFILES = $(wildcard *.wml) +WMLFILES = $(sort $(wildcard *.wml)) ifndef SUBLANG HTMLFILES = $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES)) HTMLDESTFILES = $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES)) @@ -63,11 +63,11 @@ HTMLDESTFILES = $(sort $(foreach i,$(SUBLANG),\ $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE)-$(i).html,$(WMLFILES)))) endif -OTHERFILES := $(wildcard *.ps.gz *.eps *.pdf *.css) -OTHERFILES += $(wildcard *.jpg *.jpeg *.gif *.png *.fig *.xcf *.xcf.gz *.ppm *.svg) +OTHERFILES := $(sort $(wildcard *.ps.gz *.eps *.pdf *.css)) +OTHERFILES += $(sort $(wildcard *.jpg *.jpeg *.gif *.png *.fig *.xcf *.xcf.gz *.ppm *.svg)) OTHERDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(OTHERFILES)) -existing-SUBS := $(shell for dir in $(wildcard $(SUBS)) ''; do test -d $$dir && echo $$dir; done) +existing-SUBS := $(shell for dir in $(sort $(wildcard $(SUBS))) ''; do test -d $$dir && echo $$dir; done) existing-SUBS-install := $(addsuffix -install,$(existing-SUBS)) existing-SUBS-clean := $(addsuffix -clean,$(existing-SUBS)) existing-SUBS-cleandest := $(addsuffix -cleandest,$(existing-SUBS)) @@ -146,7 +146,7 @@ ifeq "$(LANGUAGE)" "en" endif endif -LOCALEDESTFILES := $(patsubst $(ENGLISHDIR)/po/%.pot,$(LOCALEDIR)/%.mo,$(wildcard $(ENGLISHDIR)/po/*.pot)) +LOCALEDESTFILES := $(patsubst $(ENGLISHDIR)/po/%.pot,$(LOCALEDIR)/%.mo,$(sort $(wildcard $(ENGLISHDIR)/po/*.pot))) ifneq "$(LANGUAGE)" "en" # Ensure that MO files do exist |