Update copyright notices with scripts/update-copyrights

[thirdparty/glibc.git] / iconv / Makefile

diff --git a/iconv/Makefile b/iconv/Makefile
index fe0c453e7bd8dd4a738fe822db87a9e4100fef4f..e0d8ef18d6cef5d90e23bd6dd3cbbfe09c481863 100644 (file)
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997,1998,2000-2003,2004 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
@@ -12,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #      Makefile for iconv.
@@ -27,13 +26,7 @@ headers              = iconv.h gconv.h
 routines       = iconv_open iconv iconv_close \
                  gconv_open gconv gconv_close gconv_db gconv_conf \
                  gconv_builtin gconv_simple gconv_trans gconv_cache
-ifeq ($(elf),yes)
 routines       += gconv_dl
-else
-CFLAGS-gconv_db.c = -DSTATIC_GCONV
-CFLAGS-gconv_cache.c = -DSTATIC_GCONV
-CFLAGS-gconv_simple.c = -DSTATIC_GCONV
-endif
 
 vpath %.c ../locale/programs ../intl
 
@@ -49,14 +42,10 @@ CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
 CFLAGS-linereader.c = -DNO_TRANSLITERATION
 CFLAGS-simple-hash.c = -I../locale
 
-tests  = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv5
-
-distribute     = gconv_builtin.h gconv_int.h loop.c skeleton.c iconv_prog.h \
-                 iconv_charmap.c dummy-repertoire.c gconv_charset.h strtab.c \
-                 iconvconfig.h
+tests  = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5
 
 others         = iconv_prog iconvconfig
-install-others = $(inst_bindir)/iconv
+install-others-programs        = $(inst_bindir)/iconv
 install-sbin   = iconvconfig
 
 CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
@@ -78,3 +67,15 @@ $(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