X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=charset%2FMakefile;h=32cc82a7637102008980eb58efa37daf6dced645;hb=5423d3ec7aa3ff3fec105c49f7ec1a122e82561d;hp=dc8f46810554bc6923d4e875473f04f463b46728;hpb=13499b70e642fa92ae3152ed8b17bebd778a8ac0;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index dc8f4681..32cc82a7 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=charset
 
@@ -6,15 +6,40 @@ LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-
 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-pic.a: $(addsuffix .oo,$(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
+ifdef CONFIG_STATIC_PIC
+$(o)/charset/libcharset.pc: $(o)/charset/libcharset-pic.a
+endif
+
+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
+
+ifdef CONFIG_CHARSET_UTILS
+PROGS+=$(o)/charset/cs2cs
+endif
+
+$(o)/charset/cs2cs: $(o)/charset/cs2cs.o $(LIBUCW) $(o)/charset/libcharset.pc
 
 build_charsets:
 	cd $(s)/charset && sh misc/generate
 
 clean::
 	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)
+ifdef CONFIG_STATIC_PIC
+	install -m 644 run/lib/libcharset-pic.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
+endif
+
+.PHONY: install-libcharset