Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / iconv / Makefile

diff --git a/iconv/Makefile b/iconv/Makefile
index e0d8ef18d6cef5d90e23bd6dd3cbbfe09c481863..0d55eda94bebe2132c9d608ac0f2519e97266640 100644 (file)
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2015 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
@@ -52,13 +52,14 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
 CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
 CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
 
-CPPFLAGS-iconv_prog = -DNOT_IN_libc
-CPPFLAGS-iconv_charmap = -DNOT_IN_libc
-CPPFLAGS-iconvconfig = -DNOT_IN_libc
-CPPFLAGS-linereader = -DNOT_IN_libc
-CPPFLAGS-strtab = -DNOT_IN_libc
-CPPFLAGS-charmap = -DNOT_IN_libc
-CPPFLAGS-charmap-dir = -DNOT_IN_libc
+# Set libof-* for each routine.
+cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules)
+lib := iconvprogs
+include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+
+ifeq ($(run-built-tests),yes)
+xtests-special += $(objpfx)test-iconvconfig.out
+endif
 
 include ../Rules
 
@@ -68,14 +69,11 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
 $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
 $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
 
-ifeq ($(run-built-tests),yes)
-xtests: test-iconvconfig
-endif
-
-.PHONY: test-iconvconfig
-test-iconvconfig: /dev/null $(objpfx)iconvconfig
-       tmp=$(objpfx)gconv-modules.cache.$$$$; \
-       rm -f $$tmp; \
-       $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir) && \
-       cmp $$tmp $(inst_gconvdir)/gconv-modules.cache && \
-       rm -f $$tmp
+$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig
+       (set -e; \
+        tmp=$(objpfx)gconv-modules.cache.$$$$; \
+        rm -f $$tmp; \
+        $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \
+        cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \
+        rm -f $$tmp) > $@; \
+       $(evaluate-test)