tableprinter: updated table_col_<type> funcs, update of mem allocation

[libucw.git] / charset / Makefile

diff --git a/charset/Makefile b/charset/Makefile
index 61caf3014646844b7b1eb6c3823d06b8da6a4523..8e351ff1ba178805d062c9d7b39fde167fb2ca56 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,20 +1,34 @@
-# 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
 
+LIBCHARSET_PROGS=
 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
+LIBCHARSET_DEPS=$(LIBUCW)
 
-$(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)
+$(o)/charset/libucw-charset$(LV).a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libucw-charset$(LV).so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(LIBCHARSET_DEPS)
+$(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.0
+$(o)/charset/libucw-charset.pc: $(LIBCHARSET_DEPS)
 
-API_LIBS+=libcharset
+ifdef CONFIG_INSTALL_API
+$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset$(LV),.a .so)
+endif
+
+API_LIBS+=libucw-charset
 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
+run/lib/pkgconfig/libucw-charset.pc: $(o)/charset/libucw-charset.pc
+
+ifdef CONFIG_CHARSET_UTILS
+LIBCHARSET_PROGS+=$(o)/charset/ucw-cs2cs
+endif
+
+$(o)/charset/ucw-cs2cs: $(o)/charset/ucw-cs2cs.o $(LIBCHARSET) $(LIBUCW)
+
+PROGS+=$(LIBCHARSET_PROGS)
 
 build_charsets:
        cd $(s)/charset && sh misc/generate
@@ -22,11 +36,24 @@ build_charsets:
 clean::
        rm -f $(s)/charset/misc/u-*
 
-INSTALL_TARGETS+=install-libcharset
-install-libcharset:
+INSTALL_TARGETS+=install-libucw-charset-lib
+install-libucw-charset-lib:
+       install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
+       install -m 644 run/lib/libucw-charset$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.0.0
+       ln -sf libucw-charset$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.0
+.PHONY: install-libucw-charset-lib
+
+INSTALL_TARGETS+=install-libucw-charset-api
+install-libucw-charset-api:
        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
+       install -m 644 run/lib/pkgconfig/libucw-charset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+       ln -sf libucw-charset$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so
+       install -m 644 run/lib/libucw-charset$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-charset-api
+
+INSTALL_TARGETS+=install-libucw-charset-utils
+install-libucw-charset-utils:
+       install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
+       install -m 755 $(LIBCHARSET_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
+.PHONY: install-libucw-charset-utils