aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-08-14 16:08:37 -0700
committerRoland McGrath <roland@hack.frob.com>2011-08-14 16:28:51 -0700
commit675456ef83622a17c86ae60b94b8e5e3a9d5bb2f (patch)
tree6bab4ccb9f0b9c8e6ce18c99a2ac24d6891748f3
parent5e4287d16f897cde3e0201de0f96d148248c0ca9 (diff)
downloadglibc-675456ef83622a17c86ae60b94b8e5e3a9d5bb2f.zip
glibc-675456ef83622a17c86ae60b94b8e5e3a9d5bb2f.tar.gz
glibc-675456ef83622a17c86ae60b94b8e5e3a9d5bb2f.tar.bz2
Clean up locale/Makefile variables for -D switches.
-rw-r--r--ChangeLog7
-rw-r--r--locale/Makefile28
2 files changed, 24 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c67904e..341deeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-08-14 Roland McGrath <roland@hack.frob.com>
+ * locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
+ (locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
+ -Iprograms here.
+ (cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
+ (localedef-modules): Add localedef.
+ (locale-modules): Add locale.
+
* sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
* elf/rtld.c (dl_main): Invert order of assignment in last change,
to avoid a warning.
diff --git a/locale/Makefile b/locale/Makefile
index 87c29a5..ccaebf1 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -60,10 +60,11 @@ vpath %.c programs ../crypt
vpath %.h programs
vpath %.gperf programs
-localedef-modules := $(categories:%=ld-%) charmap linereader locfile \
+localedef-modules := localedef $(categories:%=ld-%) \
+ charmap linereader locfile \
repertoire locarchive
localedef-aux := md5
-locale-modules := locale-spec
+locale-modules := locale locale-spec
lib-modules := charmap-dir simple-hash xmalloc xstrdup
@@ -91,22 +92,27 @@ endif
localepath = "$(localedir):$(i18ndir)"
-locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
- -DLOCALEDIR='"$(localedir)"' \
- -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
- -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
- -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
- -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
- -Iprograms -DNOT_IN_libc
+# -Iprograms doesn't really belong here, but this gets it at the head
+# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
+# We need it before the standard -I's to see programs/config.h first.
+locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
+ -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
+ -Iprograms
+
+CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
+ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
+ -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
+ -DLOCSRCDIR='"$(i18ndir)/locales"' \
+ -DHAVE_CONFIG_H -DNOT_IN_libc
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-charmap-dir.c = -Wno-write-strings
-# This makes sure -DNOT_IN_libc is passed for all these modules.
+# This makes sure -DNOT_IN_libc et al are passed for all these modules.
cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
$(locale-modules) $(lib-modules))
-lib := nonlib
+lib := locale-programs
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.