Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / charset / Makefile

diff --git a/charset/Makefile b/charset/Makefile
index 4d8275ae1a134a06272d9e7482cb839e48c8a0fc..dc8f46810554bc6923d4e875473f04f463b46728 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -2,15 +2,19 @@
 
 DIRS+=charset
 
-LIBCHARSET_MODS=toupper tolower tocat toligatures utf8 unaccent strlen debug \
-       charconv setnames unistream fb-charconv
-LIBCHARSET=obj/charset/libcharset.$(LS)
+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-*