Redefined RadixThreshold to bound the array size instead of the number

[libucw.git] / charset / Makefile

diff --git a/charset/Makefile b/charset/Makefile
index 6454e26f56803cc690a048b4faf57fb998a852b8..8e121369474edae8b577c067cf6f94c836c547fc 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,14 +1,22 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2001 Martin Mares <mj@ucw.cz>
+# Makefile for the Sherlock Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>

 
 DIRS+=charset
 
 
 DIRS+=charset
 

-UNI_OBJS=toupper.o tolower.o tocat.o utf8.o unaccent.o strlen.o debug.o \
-       charconv.o setnames.o
+LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv stk-charconv mp-charconv
+LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h stk-charconv.h mp-charconv.h

 
 

-obj/charset/libcharset.a: $(addprefix obj/charset/,$(UNI_OBJS))
+$(o)/charset/libcharset.a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.pc: $(LIBUCW)
+
+API_LIBS+=libcharset
+API_INCLUDES+=$(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
+$(o)/charset/.include-stamp: IDST=charset
+run/lib/pkgconfig/libcharset.pc: $(o)/charset/libcharset.pc

 
 build_charsets:
 
 build_charsets:

-       cd charset && sh misc/generate
+       cd $(s)/charset && sh misc/generate

 
 clean::
 
 clean::

-       rm -f charset/misc/u-*
+       rm -f $(s)/charset/misc/u-*