Clean up locale/Makefile variables for -D switches.

(cherry picked from commit 675456ef83622a17c86ae60b94b8e5e3a9d5bb2f)

diff --git a/ChangeLog b/ChangeLog
index 1af4ec2943dbc96a223bd0d23dd60837e001919e..df81b4da9a78c65b5157dfa7d1026fc25faecb99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +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.
+
 2011-08-13  Ulrich Drepper  <drepper@gmail.com>
 
        * intl/l10nflist.c (_nl_normalize_codeset): Make it compile outside

diff --git a/locale/Makefile b/locale/Makefile
index 87c29a55a9231725b89296223771610505ed49ee..ccaebf190f37eed2b2de7949dc22b5d977e83072 100644 (file)
--- 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.