On Mon, May 8, 2017 at 10:01 AM, Andreas Schwab <schwab@suse.de> wrote:
> On Mär 22 2017, Zack Weinberg <zackw@panix.com> wrote:
>
> In fact, cppflags-iterator.mk is misnamed since a long time, since it no
> longer sets CPPFLAGS-*. Would you care to rename it in a separate
> patch?
How's this?
---
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.
Tested on x86-64-linux-gnu. Should have no effect whatsoever on
installed files.
* 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.
---
Makerules | 10 ++++------
benchtests/Makefile | 2 +-
benchtests/strcoll-inputs/filelist#en_US.UTF-8 | 3 +--
elf/Makefile | 2 +-
elf/rtld-Rules | 2 +-
extra-lib.mk | 2 +-
extra-modules.mk | 9 ---------
iconv/Makefile | 2 +-
iconvdata/Makefile | 2 +-
cppflags-iterator.mk => libof-iterator.mk | 5 +++--
locale/Makefile | 2 +-
malloc/Makefile | 2 +-
nscd/Makefile | 2 +-
sunrpc/Makefile | 2 +-
sysdeps/s390/Makefile | 2 +-
15 files changed, 16 insertions(+), 30 deletions(-)
delete mode 100644 extra-modules.mk
rename cppflags-iterator.mk => libof-iterator.mk (47%)
On Tue, May 9, 2017 at 3:49 AM, Andreas Schwab <schwab@suse.de> wrote:
> On Mai 08 2017, Zack Weinberg <zackw@panix.com> wrote:
>
>> * 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.
>
> Ok, thanks.
Committed now, will send an updated testsuite-_ISOMAC patchset shortly.
zw
similarity index 47%
rename from cppflags-iterator.mk
rename to libof-iterator.mk
@@ -1,5 +1,6 @@
-# This file is included several times in a row, once
-# for each element of $(lib)-routines and $(lib)-sysdeps_routines.
+# This file is included several times in a row, once for each element
+# $(cpp-src) of $(cpp-srcs-left). It sets libof-$(cpp-src) to $(lib)
+# for each.
cpp-src := $(firstword $(cpp-srcs-left))
cpp-srcs-left := $(filter-out $(cpp-src),$(cpp-srcs-left))
deleted file mode 100644
@@ -1,9 +0,0 @@
-# This file is included several times in a row, once
-# for each element of $(modules-names). $(extra-modules-left)
-# is initialized first to $(modules-names) so that with each
-# inclusion, we advance $(module) to the next name.
-
-module := $(firstword $(extra-modules-left))
-extra-modules-left := $(filter-out $(module),$(extra-modules-left))
-
-libof-$(notdir $(module)) := extramodules
@@ -108,5 +108,5 @@ endif
# This will define `libof-ROUTINE := LIB' for each of the routines.
cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines)
ifneq (,$(cpp-srcs-left))
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
endif
@@ -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
@@ -123,7 +123,7 @@ endif
cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
$(binaries-bench-malloc:=.c)
lib := nonlib
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
bench-extra-objs = json-lib.o
@@ -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)))
@@ -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)
@@ -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
@@ -290,7 +290,7 @@ cpp-srcs-left := $(modules) $(generated-modules)
$(libJIS-routines) \
$(libKSC-routines) $(libGB-routines) $(libCNS-routines) \
$(libISOIR165-routines) $(libJISX0213-routines)
lib := iconvdata
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
$(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out
@@ -101,4 +101,4 @@ CFLAGS-charmap-dir.c = -Wno-write-strings
cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
$(lib-modules)
lib := locale-programs
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
@@ -126,7 +126,7 @@ memusagestat-modules = memusagestat
cpp-srcs-left := $(memusagestat-modules)
lib := memusagestat
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
$(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm
@@ -92,7 +92,7 @@ endif
# Set libof-nscd.
cpp-srcs-left := $(nscd-modules)
lib := nscd
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
$(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
@@ -183,7 +183,7 @@ $(objpfx)cross-rpcgen: $(cross-rpcgen-objs)
# This makes sure -DIN_MODULE is passed for all these modules.
cpp-srcs-left := $(rpcgen-objs:.o=.c)
lib := nonlib
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
# How we run rpcgen to generate sources and headers in the rules below.
# Setting CPP tells it how to run the C preprocessor correctly. Note
@@ -18,7 +18,7 @@ include extra-module.mk
cpp-srcs-left := $(foreach mod,$(s390x-iconv-modules),$($(mod)-routines))
lib := iconvdata
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
extra-objs += $(addsuffix .so, $(s390x-iconv-modules))
install-others += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))
b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
@@ -9667,7 +9667,6 @@ hr.po
libc.pot
ko.po
ru.po
-extra-modules.mk
intl
tst-gettext4-fr.po
tstcodeset.po
@@ -13252,7 +13251,6 @@ sigset.h
atomic.h
utmp.h
stdlib-bsearch.h
-cppflags-iterator.mk
iconvdata
MISSING
ibm1164.h
@@ -15245,3 +15243,4 @@ w_exp2l.c
bug-nexttoward.c
w_dreml.c
s_nanf.c
+libof-iterator.mk