Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-threads

[libucw.git] / charset / Makefile

diff --git a/charset/Makefile b/charset/Makefile
index 40423122fc2daae7b542c7e4e9acd0e7862361b3..dc8f46810554bc6923d4e875473f04f463b46728 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,14 +1,20 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2001 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 strlen.o debug.o \
-       charconv.o setnames.o unistream.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)))
+
+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-*