aboutsummaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/Makefile13
2 files changed, 12 insertions, 6 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index a7323054ba..2ca1abeda6 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-06 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile (tests): Change dependencies to ....
+ (tests-special): ... additions to this variable.
+
2014-02-28 Roland McGrath <roland@hack.frob.com>
* Makefile (generated, generated-dirs): Use += rather than =.
diff --git a/localedata/Makefile b/localedata/Makefile
index ad801b7e75..5f01b61139 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -79,7 +79,7 @@ tests-static = bug-setlocale1-static
tests += $(tests-static)
ifeq (yes,$(build-shared))
ifneq (no,$(PERL))
-tests: $(objpfx)mtrace-tst-leaks
+tests-special += $(objpfx)mtrace-tst-leaks
endif
endif
endif
@@ -91,6 +91,12 @@ install-others := $(addprefix $(inst_i18ndir)/, \
tests: $(objdir)/iconvdata/gconv-modules
+tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
+ $(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \
+ $(objpfx)tst-trans.out $(objpfx)tst-mbswcs.out \
+ $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
+ $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out
+
include ../Rules
# Install the charmap files in gzipped format.
@@ -137,11 +143,6 @@ $(addprefix $(objpfx),$(CTYPE_FILES)): %: \
$(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \
$(addprefix $(objpfx),$(CTYPE_FILES))
-tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \
- $(objpfx)tst-rpmatch.out $(objpfx)tst-trans.out \
- $(objpfx)tst-mbswcs.out $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
- $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out
-
$(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
$(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(test-input) \