(options): short form os verbose is v.

[kopensolaris-gnu/glibc.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index c212b2e..90b2181 100644 (file)
--- 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
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or


@@ -12,16 +12,16 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
 # 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
 
 
 #
 #      Makefile for locales.
 #
 subdir := locale
 

-headers                = locale.h langinfo.h
+headers                = locale.h langinfo.h xlocale.h

 distribute     = localeinfo.h categories.def iso-4217.def weight.h \
                  strlen-hash.h \
                  $(addprefix programs/, \
 distribute     = localeinfo.h categories.def iso-4217.def weight.h \
                  strlen-hash.h \
                  $(addprefix programs/, \


@@ -32,7 +32,8 @@ distribute    = localeinfo.h categories.def iso-4217.def weight.h \
                              locfile-kw.gperf locfile-kw.h linereader.h \
                              locales.h locfile.h stringtrans.h charset.h)
 routines       = setlocale findlocale loadlocale localeconv nl_langinfo \
                              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
+                 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
 categories     = ctype messages monetary numeric time collate
 aux            = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name
 others         = localedef locale


@@ -40,6 +41,12 @@ install-bin  = localedef locale
 extra-objs     = $(localedef-modules:=.o) $(locale-modules:=.o) \
                  $(lib-modules:=.o)
 
 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
 subdir-dirs    = programs
 vpath %.c programs
 vpath %.h programs


@@ -64,10 +71,19 @@ $(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o)
 $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
 $(objpfx)localedef $(objpfx)locale: $(lib-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
            -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