diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-05-08 15:52:26 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-05-09 07:06:29 -0400 |
| commit | 2bfdaeddaad93425b93c42ef7a75443b96824942 (patch) | |
| tree | ba08f29a6a80c64d9327e57a915d39f6e0750cee /Makerules | |
| parent | 61f4fa7fd71407b56c32e6be5147d84536697569 (diff) | |
| download | glibc-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 'Makerules')
| -rw-r--r-- | Makerules | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Makerules b/Makerules index 7f0eef8096..15f46e5f3a 100644 --- a/Makerules +++ b/Makerules @@ -794,11 +794,9 @@ endif # The makefile may define $(modules-names) to build additional modules. # These are built with $(build-module), except any in $(modules-names-nobuild). ifdef modules-names -# extra-lib.mk is included once for each extra lib to define rules -# to build it, and to add its objects to the various variables. -# During its evaluation, $(lib) is set to the name of the library. -extra-modules-left := $(modules-names) -include $(patsubst %,$(..)extra-modules.mk,$(modules-names)) +cpp-srcs-left := $(modules-names) +lib = extramodules +include $(patsubst %,$(..)libof-iterator.mk,$(modules-names)) extra-modules-build := $(filter-out $(modules-names-nobuild),$(modules-names)) $(extra-modules-build:%=$(objpfx)%.so): $(objpfx)%.so: \ @@ -1327,7 +1325,7 @@ all-nonlib = $(strip $(tests) $(xtests) $(test-srcs) $(test-extras) $(others)) ifneq (,$(all-nonlib)) cpp-srcs-left = $(all-nonlib) lib := nonlib -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) endif |