From 51702635af8445431054291c86aaace7c30b0970 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 7 May 1997 15:31:21 +0000 Subject: Update. * locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and _NL_CTYPE_MAP_NAMES field to stringlist. Change name of _NL_CTYPE_CODESET_NAME to "charmap". * locale/localeinfo.h (enum value_type): Add stringlist. * locale/programs/locale.c (show_info): Handle stringlist. * locale/programs/charmap.c (charmap_read): If charmap file is not using the given name try to find it by looking through all available charmap files and compare the code set name. * locale/programs/locale.c (write_charmaps): Also print names of charset in fields in the files. * elf/ldd.bash.in: Correct translatable strings. * posix/TESTS: Add some more tests for character class matching. * posix/regex.c: Merge with GNU awk version. (regex_compile): Use ISO C/amend 1 functions for character class handling. * posix/regex.h: Merge with GNU awk version. * posix/getopt.c: Declare as master copies. * posix/getopt1.c: Likewise. * posix/getopt.h: Likewise. * sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option value to mount functions. Patch by a sun . * stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency with other tests. * sunrpc/svc_run.c (svc_exit): New, defined. (svc_run): Test for svc_stop variable. * sysdeps/m68k/s_cexp.c: Rewritten. * sysdeps/m68k/s_cexpf.c: Likewise. * sysdeps/m68k/s_cexpl.c: Likewise. --- Makerules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index 10cbd972e4..31b965f3d7 100644 --- a/Makerules +++ b/Makerules @@ -477,8 +477,8 @@ others: $(addprefix $(objpfx),$(install-lib)) ifndef objects # Create the stamp$o files to keep the parent makefile happy. -subdir_lib: $(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir)) -$(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir)): +subdir_lib: $(foreach o,$(object-suffixes),$(objpfx)stamp$o) +$(foreach o,$(object-suffixes),$(objpfx)stamp$o): $(make-target-directory) rm -f $@; > $@ else @@ -490,19 +490,19 @@ else define o-iterator-doit $(common-objpfx)$(patsubst %,$(libtype$o),c)(\ $(addsuffix .%,$(filter-out $(elide-routines$o),$(notdir $(objects:.o=))))): \ - $(objpfx)stamp.%-$(subdir) ; + $(objpfx)stamp.% ; endef object-suffixes-left := $(object-suffixes) include $(o-iterator) -# The pattern rule tells Make to remake $(objpfx)stamp.%-$(subdir) as +# The pattern rule tells Make to remake $(objpfx)stamp.% as # the way to update all the foo.% object files in $(objects). Now we -# define explicit rules to update each $(objpfx)stamp.SUFFIX-$(subdir) +# define explicit rules to update each $(objpfx)stamp.SUFFIX # timestamp file; these rules (one explicit rule is generated for each # object suffix) will update the parent archive with ar. Use a static # pattern rule so $* is set to the object type during the commands. define o-iterator-doit -$(objpfx)stamp$o-$(subdir): $(objpfx)stamp%-$(subdir): $(o-objects); $$(do-ar) +$(objpfx)stamp$o: $(objpfx)stamp%: $(o-objects); $$(do-ar) endef object-suffixes-left := $(object-suffixes) include $(o-iterator) @@ -529,7 +529,7 @@ $(common-objpfx)$(patsubst %,$(libtype$o),c)($(ar-symtab-name)): \ $$(RANLIB) $$(common-objpfx)$$(patsubst %,$$(libtype$o),c) endef ifndef subdir -subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%-$d) +subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%) subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps)) $(subdirs-stamps): subdir_lib; endif @@ -866,7 +866,7 @@ common-mostlyclean: $(rmobjs) define rmobjs $(foreach o,$(object-suffixes), --rm -f $(addprefix $(objpfx),stamp$o-$(subdir)) $(o-objects)) +-rm -f $(objpfx)stamp$o $(o-objects)) endef # Also remove the dependencies and generated source files. -- cgit 1.4.1