[PATCH 4/5] iconvdata: Move gconv-modules configuration to gconv-modules.conf

[DJ Delorie]

Siddhesh Poyarekar via Libc-alpha <libc-alpha@sourceware.org> writes:

> +gconv-modules = gconv-modules.conf
> +modpfx = $(objpfx)gconv-modules.d/

Ok

>  install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
> -		  $(inst_gconvdir)/gconv-modules
> +		  $(addprefix $(inst_gconvdir)/gconv-modules.d/, \
> +			      $(gconv-modules))

from .../gconv-modules to .../gconv-modules.d/gconv-modules.conf, ok

>  ifdef objpfx
> -generated += gconv-modules
> +generated += $(addprefix gconv-modules.d/,$(gconv-modules))
>  endif

Same, ok

> -$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules $(+force)
> +$(addprefix $(inst_gconvdir)/gconv-modules.d/, $(gconv-modules)): \
> +    $(inst_gconvdir)/gconv-modules.d/%: $(modpfx)% $(+force)
>  	$(do-install)

Ok.

> @@ -303,28 +307,29 @@ $(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out
>  	$(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \
>  	$(evaluate-test)
>  
> -$(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv1.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv2.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv3.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv5.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv5.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)tst-loading.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-loading.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			  $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-iconv4.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-iconv7.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv10.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			  $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv12.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			  $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv14.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv14.out: $(addprefix $(modpfx), $(gconv-modules)) \
>  			  $(addprefix $(objpfx),$(modules.so))

Ok.

> -$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
> +$(objpfx)iconv-test.out: run-iconv-test.sh \
> +			 $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so)) \
>  			 $(common-objdir)/iconv/iconv_prog TESTS

Ok.

> -$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
> +$(objpfx)tst-tables.out: tst-tables.sh \
> +			 $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so)) \
>  			 $(objpfx)tst-table-from $(objpfx)tst-table-to
>  	$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \

Ok.

> -$(objpfx)gconv-modules: gconv-modules
> -	cat $(sysdeps-gconv-modules) $^ > $@
> +$(modpfx):
> +	mkdir -p $@
> +
> +$(modpfx)%: % $(modpfx)
> +	cp $< $@

Ok.

>  # Test requires BIG5HKSCS.
> -$(objpfx)tst-iconv-big5-hkscs-to-2ucs4.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-iconv-big5-hkscs-to-2ucs4.out: \
> +			 $(addprefix $(modpfx), $(gconv-modules)) \
>  			 $(addprefix $(objpfx),$(modules.so))

Ok.

> diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules.conf
> similarity index 100%
> rename from iconvdata/gconv-modules
> rename to iconvdata/gconv-modules.conf

Ok.

> diff --git a/localedata/Makefile b/localedata/Makefile
>  
> -tests: $(objdir)/iconvdata/gconv-modules
> +tests: $(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf

Ok.

> -$(objdir)/iconvdata/gconv-modules:
> +$(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf:
>  	$(MAKE) -C ../iconvdata subdir=iconvdata $@

Ok.

> diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
> -install-others  += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))
> +install-others  += $(patsubst %, $(inst_gconvdir)/%.so, \
> +				 $(s390x-iconv-modules)) \
> +		   $(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf

Ok

>  $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) : \
>  $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
>  	$(do-install-program)
>  
> -sysdeps-gconv-modules = ../sysdeps/s390/gconv-modules
> +ifdef objpfx
> +generated += gconv-modules.d/gconv-modules-s390.conf
> +endif
> +
> +$(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf: \
> +		$(modpfx)gconv-modules-s390.conf $(+force)
> +	$(do-install)
> +
> +$(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \
> +				  $(modpfx)
> +	cp $< $@
>  endif

Ok

> diff --git a/sysdeps/s390/gconv-modules b/sysdeps/s390/gconv-modules-s390.conf
> similarity index 100%
> rename from sysdeps/s390/gconv-modules
> rename to sysdeps/s390/gconv-modules-s390.conf

Ok

Reviewed-by: DJ Delorie <dj@redhat.com>