X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=charset%2FMakefile;h=dc8f46810554bc6923d4e875473f04f463b46728;hb=8ab69f51fccccbcae521bd7f7e3ae27146fd1217;hp=5f6f500a20d33224b58bc047e907f1afb3740296;hpb=87068a647539633ea26096e6e363c508f006ca5a;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 5f6f500a..dc8f4681 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -2,14 +2,19 @@
 
 DIRS+=charset
 
-LIBCHARSET_MODS=toupper tolower tocat utf8 unaccent strlen debug \
-	charconv setnames unistream
+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: $(addsuffix .o,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
-obj/charset/libcharset.so: $(addsuffix .oo,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+
+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
 
 build_charsets:
-	cd charset && sh misc/generate
+	cd $(s)/charset && sh misc/generate
 
 clean::
-	rm -f charset/misc/u-*
+	rm -f $(s)/charset/misc/u-*