X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2FMakefile;h=8e351ff1ba178805d062c9d7b39fde167fb2ca56;hb=9adf0cac23ff0639f64a9d510c71e5aab44c27e9;hp=9b37fe68449e55f72ee633859aa5a8a3d98666c7;hpb=601499c1c1bb2196641ee1aebc127b901fe82458;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 9b37fe68..8e351ff1 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -2,20 +2,18 @@
 
 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/libucw-charset.a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
-$(o)/charset/libucw-charset-pic.a: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
-$(o)/charset/libucw-charset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
-$(o)/charset/libucw-charset.so: SONAME_SUFFIX=.$(UCW_ABI_VERSION)
-$(o)/charset/libucw-charset.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)
 
-ifdef CONFIG_STATIC_PIC
-$(o)/charset/libucw-charset.pc: $(o)/charset/libucw-charset-pic.a
-endif
 ifdef CONFIG_INSTALL_API
-$(o)/charset/libucw-charset.pc: $(o)/charset/libucw-charset.a $(o)/charset/libucw-charset-pic.a $(o)/charset/libucw-charset.so
+$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset$(LV),.a .so)
 endif
 
 API_LIBS+=libucw-charset
@@ -25,10 +23,12 @@ $(o)/charset/.include-stamp: IDST=charset
 run/lib/pkgconfig/libucw-charset.pc: $(o)/charset/libucw-charset.pc
 
 ifdef CONFIG_CHARSET_UTILS
-PROGS+=$(o)/charset/cs2cs
+LIBCHARSET_PROGS+=$(o)/charset/ucw-cs2cs
 endif
 
-$(o)/charset/cs2cs: $(o)/charset/cs2cs.o $(LIBUCW) $(o)/charset/libucw-charset.pc
+$(o)/charset/ucw-cs2cs: $(o)/charset/ucw-cs2cs.o $(LIBCHARSET) $(LIBUCW)
+
+PROGS+=$(LIBCHARSET_PROGS)
 
 build_charsets:
 	cd $(s)/charset && sh misc/generate
@@ -36,18 +36,24 @@ build_charsets:
 clean::
 	rm -f $(s)/charset/misc/u-*
 
-INSTALL_TARGETS+=install-libucw-charset install-libucw-charset-api
-
-install-libucw-charset:
+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.so.$(UCW_ABI_VERSION) $(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/pkgconfig/libucw-charset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-	ln -sf libucw-charset.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset.so
-	install -m 644 run/lib/libucw-charset.a $(DESTDIR)$(INSTALL_LIB_DIR)
-	install -m 644 run/lib/libucw-charset-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
-
-.PHONY: install-libucw-charset install-libucw-charset-api
+	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