X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2FMakefile;h=23d40f8c8e896cf52b7e166ab30e5d294eb08862;hb=31316f76dd68a03b803f51931d6e1fff2c60c5d1;hp=e375f99b184d22955377cb545b8744192f94a2f4;hpb=6cd259eef0156a10e4cfb239b40801da70c62f46;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index e375f99b..23d40f8c 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,9 +6,14 @@ 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))
@@ -21,17 +26,14 @@ build_charsets:
 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/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