diff options
Diffstat (limited to 'iconv/Makefile')
-rw-r--r-- | iconv/Makefile | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index b008707eb5..d71319b39e 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2016 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 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 @@ -31,36 +31,51 @@ routines += gconv_dl vpath %.c ../locale/programs ../intl iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \ - dummy-repertoire simple-hash xstrdup xmalloc + dummy-repertoire simple-hash xstrdup xmalloc \ + record-status iconvconfig-modules = strtab xmalloc hash-string extra-objs = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o) -CFLAGS-iconv_prog.c = -I../locale/programs -CFLAGS-iconv_charmap.c = -I../locale/programs -CFLAGS-dummy-repertoire.c = -I../locale/programs -CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ +CFLAGS-iconv_prog.c += -I../locale/programs +CFLAGS-iconv_charmap.c += -I../locale/programs +CFLAGS-dummy-repertoire.c += -I../locale/programs +CFLAGS-charmap.c += -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ -DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER -CFLAGS-linereader.c = -DNO_TRANSLITERATION -CFLAGS-simple-hash.c = -I../locale +CFLAGS-linereader.c += -DNO_TRANSLITERATION +CFLAGS-simple-hash.c += -I../locale -tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 +tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 others = iconv_prog iconvconfig install-others-programs = $(inst_bindir)/iconv install-sbin = iconvconfig CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' -CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' -CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' +CFLAGS-gconv_conf.c += -DGCONV_PATH='"$(gconvdir)"' +CFLAGS-iconvconfig.c += -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' # Set libof-* for each routine. cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules) lib := iconvprogs -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) ifeq ($(run-built-tests),yes) xtests-special += $(objpfx)test-iconvconfig.out endif +# Make a copy of the file because gconv module names are constructed +# relative to the path of the configuration file. +$(objpfx)gconv-modules: test-gconv-modules + cp $< $@ + +ifeq (yes,$(build-shared)) +tests += tst-gconv-init-failure +modules-names += tst-gconv-init-failure-mod +modules-names-tests += tst-gconv-init-failure-mod +$(objpfx)tst-gconv-init-failure-mod.so: $(libsupport) +$(objpfx)tst-gconv-init-failure.out: \ + $(objpfx)gconv-modules $(objpfx)tst-gconv-init-failure-mod.so +endif + include ../Rules $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) |