From 2b83a2a4d978012cdf78b648337c31091e20526d Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Thu, 18 May 1995 09:00:09 +0000
Subject: Wed May 17 16:50:21 1995  Roland McGrath 
 <roland@churchy.gnu.ai.mit.edu>

	Merged 1003.2 locale and localedef programs by Ulrich Drepper.
	* locale/charmap.c: New file.
	* locale/collate.c: New file.
	* locale/config.h: New file.
	* locale/ctype.c: New file.
	* locale/ctypedump.c: New file.
	* locale/hash.c: New file.
	* locale/hash.h: New file.
	* locale/iso-4217.def: New file.
	* locale/keyword.gperf: New file.
	* locale/keyword.h: New file.
	* locale/libintl.h: New file.
	* locale/locale.c: New file.
	* locale/localedef.c: New file.
	* locale/localedef.h: New file.
	* locale/locfile-lex.c: New file.
	* locale/locfile-parse.c: New file.
	* locale/messages.c: New file.
	* locale/monetary.c: New file.
	* locale/numeric.c: New file.
	* locale/token.h: New file.

	* posix/regex.c, posix/regex.h: New files, incorporated from GNU regex.
	* posix/Makefile (headers): Add regex.h.
	(routines): Add regex.
	(gpl2lgpl): Add regex.c and regex.h.

Tue May 16 17:35:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* locale/loadlocale.c: Expect macro LOCALE_PATH to be defined,
 	instead of hard-coding "/share/locale".
---
 locale/Makefile | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'locale/Makefile')

diff --git a/locale/Makefile b/locale/Makefile
index 87a6706e05..c3abc2c62e 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -21,10 +21,36 @@
 #
 subdir	:= locale
 
-headers		:= locale.h
-distribute	:= localeinfo.h categories.def
-routines	:= setlocale loadlocale localeconv
-categories	:= ctype messages monetary numeric time collate
+headers		= locale.h
+distribute	= localeinfo.h categories.def \
+		  $(localedef-modules:=.c) $(locale-modules:=.c) \
+		  $(lib-modules:=.c) config.h hash.h iso-4217.def \
+		  keyword.gperf keyword.h localedef.h token.h
+routines	= setlocale loadlocale localeconv nl_langinfo
+categories	= ctype messages monetary numeric time collate
 aux		= $(categories:%=lc-%) $(categories:%=C-%)
+others		= localedef locale
+install-bin	= localedef locale
+extra-objs	= $(localedef-modules:=.o) $(locale-modules:=.o) \
+		  $(lib-modules:=.o)
+
+localedef-modules	:= charmap locfile-lex locfile-parse ctype \
+			   monetary messages collate numeric
+locale-modules		:= ctypedump
+lib-modules		:= error hash xmalloc
+
+
+GPERF = gperf
+GPERFFLAGS = -acCgopt -k1,2,5,$$
 
 include ../Rules
+
+keyword.h: keyword.gperf
+	$(GPERF) $(GPERFFLAGS) $< > $@.new
+	mv -f $@.new $@
+
+$(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='"$(nlsdir)/charmap"'
-- 
cgit 1.4.1