X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2FMakefile;h=dc8f46810554bc6923d4e875473f04f463b46728;hb=4142115bf20293bef998d1f683ac7ce3008178fb;hp=115b0bb1abb8a20a7ef84407cfd5d7e01fa81afb;hpb=bf26e57bfef82cc2041b7236fd9edea24b578ad3;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 115b0bb1..dc8f4681 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -2,19 +2,19 @@
 
 DIRS+=charset
 
-LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv
-LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h
+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+=obj/charset/.include-stamp
-obj/charset/.include-stamp: $(addprefix charset/,$(LIBCHARSET_INCLUDES))
-	build/install-includes charset run/include/charset $(?F)
-	touch obj/charset/.include-stamp
+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-*