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

diff --git a/charset/Makefile b/charset/Makefile
index db40deb4..32cc82a7 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=charset
 
@@ -6,15 +6,26 @@ 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)
 
+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))
 $(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
 
@@ -27,5 +38,8 @@ install-libcharset:
 	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