summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-05-08 15:52:26 -0400
committerZack Weinberg <zackw@panix.com>2017-05-09 07:06:29 -0400
commit2bfdaeddaad93425b93c42ef7a75443b96824942 (patch)
treeba08f29a6a80c64d9327e57a915d39f6e0750cee /iconv
parent61f4fa7fd71407b56c32e6be5147d84536697569 (diff)
downloadglibc-2bfdaeddaad93425b93c42ef7a75443b96824942.tar.gz
glibc-2bfdaeddaad93425b93c42ef7a75443b96824942.tar.xz
glibc-2bfdaeddaad93425b93c42ef7a75443b96824942.zip
Rename cppflags-iterator.mk to libof-iterator.mk, remove extra-modules.mk.
cppflags-iterator.mk no longer has anything to do with CPPFLAGS; all
it does is set libof-$(foo) for a list of files.  extra-modules.mk
does the same thing, but with a different input variable, and doesn't
let the caller control the module.  Therefore, this patch gives
cppflags-iterator.mk a better name, removes extra-modules.mk, and
updates all uses of both.

	* extra-modules.mk: Delete file.
	* cppflags-iterator.mk: Rename to ...
	* libof-iterator.mk: ...this.  Adjust comments.

	* Makerules, extra-lib.mk, benchtests/Makefile, elf/Makefile
	* elf/rtld-Rules, iconv/Makefile, locale/Makefile, malloc/Makefile
	* nscd/Makefile, sunrpc/Makefile, sysdeps/s390/Makefile:
	Use libof-iterator.mk instead of cppflags-iterator.mk or
	extra-modules.mk.

	* benchtests/strcoll-inputs/filelist#en_US.UTF-8: Remove
	extra-modules.mk and cppflags-iterator.mk, add libof-iterator.mk.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/iconv/Makefile b/iconv/Makefile
index 2b2bc8e303..b2fead0479 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -55,7 +55,7 @@ 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