From 2bfdaeddaad93425b93c42ef7a75443b96824942 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Mon, 8 May 2017 15:52:26 -0400 Subject: 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. --- elf/Makefile | 2 +- elf/rtld-Rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index cc4aeb25b6..baf967821c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -547,7 +547,7 @@ CFLAGS-rtld.c = $(SYSCONF-FLAGS) cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) diff --git a/elf/rtld-Rules b/elf/rtld-Rules index 99b5899f7d..2c7b99828c 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -142,7 +142,7 @@ endif # Set libof-* for each routine. cpp-srcs-left := $(rtld-modules:%.os=%) lib := rtld -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) rtld-CFLAGS += $(no-stack-protector) -- cgit 1.4.1