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

diff --git a/charset/Makefile b/charset/Makefile
index 64a8119e..e375f99b 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,20 +1,37 @@
-# 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
 
 clean::
 	rm -f $(s)/charset/misc/u-*
+
+ifdef CONFIG_SHARED
+LIBCHARSET_NAME=libcharset.so
+else
+LIBCHARSET_NAME=libcharset.a
+endif
+
+INSTALL_TARGETS+=install-libcharset
+install-libcharset:
+	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 $(addprefix run/include/charset/,$(LIBCHARSET_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset
+	install -m 644 run/lib/$(LIBCHARSET_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/pkgconfig/libcharset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+
+.PHONY: install-libcharset