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

diff --git a/charset/Makefile b/charset/Makefile
index 115b0bb1..db40deb4 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,20 +1,31 @@
-# 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
 
-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)))
+$(o)/charset/libcharset.pc: $(LIBUCW)
 
-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
+API_LIBS+=libcharset
+API_INCLUDES+=$(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
+$(o)/charset/.include-stamp: IDST=charset
+run/lib/pkgconfig/libcharset.pc: $(o)/charset/libcharset.pc
 
 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-*
+
+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.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/pkgconfig/libcharset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+
+.PHONY: install-libcharset