X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2FMakefile;h=32cc82a7637102008980eb58efa37daf6dced645;hb=eec6d2c37cbcbf9c350aa4ca80e5a316e5144087;hp=33998db53b0a9e91a5b2b69d17da8ad1435e1e85;hpb=91904323fb8abb0f9dec9a7a71dda81b44b81869;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 33998db5..32cc82a7 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -10,12 +10,22 @@ $(o)/charset/libcharset-pic.a: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCH
 $(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
 
@@ -28,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