X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=charset%2FMakefile;h=dc8f46810554bc6923d4e875473f04f463b46728;hb=8ab69f51fccccbcae521bd7f7e3ae27146fd1217;hp=6c3d1c386a9b621fece00f9106ffa92b9bbcd866;hpb=ecba25617ac0c7e81f1c16238f85cb02b6e05014;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 6c3d1c38..dc8f4681 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,22 +1,20 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2000 Martin Mares <mj@ucw.cz>
+# Makefile for the Sherlock Charset Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
 
 DIRS+=charset
 
-UNI_OBJS=toupper.o tolower.o tocat.o utf8.o unaccent.o tosig.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)))
 
-build_charsets: clean_charsets
-	misc/unisplit
-	misc/gentab _U_cat byte <misc/u-cat >U-cat.h
-	misc/gentab _U_lower word <misc/u-lower >U-lower.h
-	misc/gentab _U_upper word <misc/u-upper >U-upper.h
-	misc/mkunacc >misc/u-unacc
-	misc/gentab _U_unaccent word <misc/u-unacc >U-unacc.h
-	misc/mksig >misc/u-sig
-	misc/gentab _U_sig byte <misc/u-sig >U-sig.h
-	misc/tabgen <misc/chartable.in >chartable.h
+INCLUDES+=$(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
+	$(s)/build/install-includes $(s)/charset run/include/charset $(?F)
+	touch $(o)/charset/.include-stamp
 
-clean_charsets:
-	rm -f misc/u-* U-*.h chartable.h
+build_charsets:
+	cd $(s)/charset && sh misc/generate
+
+clean::
+	rm -f $(s)/charset/misc/u-*