X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=locale%2FMakefile;h=90b218130dce9ff89aac112daaa721beac432d82;hp=d7941d689fdf36b4d356274ed800b5c010fd1ed5;hb=28950af4f2c330eb35dfe8c098c0535d9a52b798;hpb=0a41ce9ae1dec0ffc7932f3db897134c07447516

diff --git a/locale/Makefile b/locale/Makefile
index d7941d689f..90b218130d 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -12,23 +12,28 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #	Makefile for locales.
 #
 subdir	:= locale
 
-headers		= locale.h langinfo.h
-distribute	= localeinfo.h categories.def \
-		  $(localedef-modules:=.c) $(locale-modules:=.c) \
-		  $(lib-modules:=.c) config.h simple-hash.h iso-4217.def \
-		  charmap-kw.gperf charmap-kw.h locfile-token.h \
-		  locfile-kw.gperf locfile-kw.h linereader.h \
-		  locales.h locfile.h stringtrans.h
-routines	= setlocale findlocale loadlocale localeconv nl_langinfo
+headers		= locale.h langinfo.h xlocale.h
+distribute	= localeinfo.h categories.def iso-4217.def weight.h \
+		  strlen-hash.h \
+		  $(addprefix programs/, \
+			      locale.c localedef.c \
+			      $(localedef-modules:=.c) $(locale-modules:=.c) \
+			      $(lib-modules:=.c) config.h simple-hash.h \
+			      charmap-kw.gperf charmap-kw.h locfile-token.h \
+			      locfile-kw.gperf locfile-kw.h linereader.h \
+			      locales.h locfile.h stringtrans.h charset.h)
+routines	= setlocale findlocale loadlocale localeconv nl_langinfo \
+		  mb_cur_max codeset_name \
+		  newlocale duplocale freelocale
 categories	= ctype messages monetary numeric time collate
 aux		= $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name
 others		= localedef locale
@@ -36,11 +41,20 @@ install-bin	= localedef locale
 extra-objs	= $(localedef-modules:=.o) $(locale-modules:=.o) \
 		  $(lib-modules:=.o)
 
+extra-libs	= libBrokenLocale
+extra-libs-others = $(extra-libs)
+
+libBrokenLocale-routines = broken_cur_max
+libBrokenLocale-map = libBrokenLocale.map
+
+subdir-dirs	= programs
 vpath %.c programs
 vpath %.h programs
+vpath %.gperf programs
 
 localedef-modules	:= $(categories:%=ld-%) charmap charset linereader \
 			   locfile stringtrans
+locale-modules		:= locale-spec
 lib-modules		:= simple-hash xmalloc xstrdup
 
 
@@ -57,10 +71,19 @@ $(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o)
 $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
 $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
 
-CPPFLAGS := -DLOCALE_PATH='"$(localedir)"' \
-	    -DCHARMAP_PATH='"$(i18ndir)/charmap"' \
+localepath = "$(localedir):$(i18ndir)"
+
+CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
+	    -DLOCALEDIR='"$(localedir)"' \
+	    -DLOCALE_ALIAS_PATH='"$(localedir):$(i18ndir)"' \
+	    -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
 	    -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
 	    -Iprograms $(CPPFLAGS)
 
 CFLAGS-charmap.c = -Wno-write-strings
 CFLAGS-locfile.c = -Wno-write-strings
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libBrokenLocale.so: $(common-objpfx)libc.so