Consistently include Makeconfig after defining subdir.

[thirdparty/glibc.git] / iconvdata / Makefile

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index eac51ba5720de0dc5794f58ac57766ecbb73fd3e..01f50d2ac7ddc86c5879bf6bcd9f14c8d36da946 100644 (file)
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2008, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,8 @@
 #
 subdir := iconvdata
 
+include ../Makeconfig
+
 # Names of all the shared objects which implement the transformations.
 modules        := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5             \
           ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10            \
@@ -63,8 +65,6 @@ modules       := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5             \
 
 modules.so := $(addsuffix .so, $(modules))
 
-include ../Makeconfig
-
 ifeq (yes,$(build-shared))
 tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
        tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9
@@ -267,7 +267,7 @@ endif # build-shared = yes
 
 include ../Rules
 
-ifeq (no,$(cross-compiling))
+ifeq ($(run-built-tests),yes)
 ifeq (yes,$(build-shared))
 tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out
 ifneq (no,$(PERL))
@@ -278,7 +278,8 @@ endif
 
 tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
 $(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out
-       $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
+       $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \
+       $(evaluate-test)
 
 $(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
                         $(addprefix $(objpfx),$(modules.so))
@@ -299,12 +300,15 @@ $(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
 $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
                         $(addprefix $(objpfx),$(modules.so)) \
                         $(common-objdir)/iconv/iconv_prog TESTS
-       $(SHELL) -e $< $(common-objdir) > $@
+       $(SHELL) $< $(common-objdir) '$(test-wrapper)' > $@; \
+       $(evaluate-test)
 
 $(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
                         $(addprefix $(objpfx),$(modules.so)) \
                         $(objpfx)tst-table-from $(objpfx)tst-table-to
-       $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ > $@
+       $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
+               '$(test-program-prefix)' > $@; \
+       $(evaluate-test)
 
 do-tests-clean common-mostlyclean: tst-tables-clean