X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2FMakefile;h=dc8f46810554bc6923d4e875473f04f463b46728;hb=0e5c5828c3f3e1abd14bd012827e6b467075290b;hp=dbd352f7b916ca4275ed32a076a03cb56b9b61d5;hpb=4ca836182b50a84e7af4bf8237864fdc521520a1;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index dbd352f7..dc8f4681 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -2,14 +2,19 @@
 
 DIRS+=charset
 
-LIBCHARSET_MODS=toupper tolower tocat toligatures utf8 unaccent strlen debug \
-	charconv setnames unistream fb-charconv
+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-*