X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=charset%2FMakefile;h=8e121369474edae8b577c067cf6f94c836c547fc;hb=1a3cd3005f2a5cda8dbdaaf8f153ae5703845876;hp=64a8119e4baae0fb623bf74a88c9b3e677be8ffc;hpb=136c4f2fe9e1b7df2929c240e5a94973f596a259;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 64a8119e..8e121369 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,17 +1,19 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
+# Makefile for the Sherlock Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 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
 
 $(o)/charset/libcharset.a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
 $(o)/charset/libcharset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.pc: $(LIBUCW)
 
-INCLUDES+=$(o)/charset/.include-stamp
+API_LIBS+=libcharset
+API_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
+$(o)/charset/.include-stamp: IDST=charset
+run/lib/pkgconfig/libcharset.pc: $(o)/charset/libcharset.pc
 
 build_charsets:
 	cd $(s)/charset && sh misc/generate