Packages: Added a custom string to names of compiled libraries.

diff --git a/build/Maketop b/build/Maketop
index 39e6b0a8ba955a1fdef11a1d859b6c6f1b38b34f..93161aeb5e9e26debd04e777b9a5c31c6813325d 100644 (file)
--- a/build/Maketop
+++ b/build/Maketop
@@ -43,6 +43,7 @@ else
 LS=a
 OS=o
 endif
+LV=$(UCW_ABI_SUFFIX)
 
 SO_RUNDIR=lib
 

diff --git a/charset/Makefile b/charset/Makefile
index 9e6cac14ad964544f03070ff533ef5394ed286fb..872fa19adf26ff1bef331fc859ae57b936592eb6 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -6,17 +6,17 @@ 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
 
-$(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_MAJOR)
+$(o)/charset/libucw-charset$(LV).a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libucw-charset$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libucw-charset$(LV).so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 $(o)/charset/libucw-charset.pc: $(LIBUCW)
 
 ifdef CONFIG_STATIC_PIC
-$(o)/charset/libucw-charset.pc: $(o)/charset/libucw-charset-pic.a
+$(o)/charset/libucw-charset.pc: $(o)/charset/libucw-charset$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset,.a -pic.a .so)
+$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset$(LV),.a -pic.a .so)
 endif
 
 API_LIBS+=libucw-charset
@@ -42,7 +42,7 @@ clean::
 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_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset.so.$(UCW_ABI_VERSION)
+       install -m 644 run/lib/libucw-charset$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-charset-lib
 
 INSTALL_TARGETS+=install-libucw-charset-api
@@ -50,9 +50,9 @@ 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)
+       ln -sf libucw-charset$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so
+       install -m 644 run/lib/libucw-charset$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+       install -m 644 run/lib/libucw-charset$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-charset-api
 
 INSTALL_TARGETS+=install-libucw-charset-utils

diff --git a/charset/libucw-charset.pc b/charset/libucw-charset.pc
index b4a17ca3fd2e2734b9407c1315fdce0c2a977039..baf0245bad03baaa3fdccbc5380e99451523a010 100644 (file)
--- a/charset/libucw-charset.pc
+++ b/charset/libucw-charset.pc
@@ -8,7 +8,7 @@ picsuffix=
 
 Name: libucw-charset
 Description: Character set conversion library
-Version: @UCW_ABI_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} -lucw-charset${picsuffix}
+Libs: -L${libdir} -lucw-charset@UCW_ABI_SUFFIX@${picsuffix}
 Requires: @DEPS@

diff --git a/debian/control.in b/debian/control.in
index 0789e42199ea8e96a5ddc320d406f2dea6c322d4..b8cc5b98c8a1c0b4238559831a94d99b5096089f 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Maintainer: LibUCW developers <libucw-devel@ucw.cz>
 Build-Depends: debhelper (>= 7), devscripts, bash, pkg-config, libjpeg-dev, libpng-dev, libgif-dev, asciidoc
 Standards-Version: 3.8.0
 
-Package: libucw-@UCW_ABI_MAJOR@
+Package: libucw@UCW_ABI_SUFFIX@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -13,7 +13,7 @@ Description: LibUCW library
 Package: libucw-dev
 Section: libdevel
 Architecture: any
-Depends: libucw-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Depends: libucw@UCW_ABI_SUFFIX@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW development files
 
 Package: libucw-utils
@@ -28,7 +28,7 @@ Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW documentation
 
-Package: libucw-charset-@UCW_ABI_MAJOR@
+Package: libucw-charset@UCW_ABI_SUFFIX@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -37,7 +37,7 @@ Description: LibUCW charset library
 Package: libucw-charset-dev
 Section: libdevel
 Architecture: any
-Depends: libucw-charset-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Depends: libucw-charset@UCW_ABI_SUFFIX@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW charset development files
 
 Package: libucw-charset-utils
@@ -46,7 +46,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW charset utilities
 
-Package: libucw-xml-@UCW_ABI_MAJOR@
+Package: libucw-xml@UCW_ABI_SUFFIX@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -55,10 +55,10 @@ Description: LibUCW XML parser library
 Package: libucw-xml-dev
 Section: libdevel
 Architecture: any
-Depends: libucw-xml-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Depends: libucw-xml@UCW_ABI_SUFFIX@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW XML parser development files
 
-Package: libucw-images-@UCW_ABI_MAJOR@
+Package: libucw-images@UCW_ABI_SUFFIX@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -67,7 +67,7 @@ Description: LibUCW image library
 Package: libucw-images-dev
 Section: libdevel
 Architecture: any
-Depends: libucw-images-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Depends: libucw-images@UCW_ABI_SUFFIX@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW image development files
 
 Package: libucw-images-utils

diff --git a/debian/rules b/debian/rules
index b1122861451c0d4b2e140337a772533bd39b92bc..3d7527a0b4c1ba972c9fa2669b1b27853d81cf0f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +27,18 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-$(UCW_ABI_MAJOR) install-libucw-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw$(UCW_ABI_SUFFIX) install-libucw-lib
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev install-libucw-api
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-ucw-shell install-ucw-utils
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs install-libucw-config
        install -d -m 755 $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples
        cp -r examples/external $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples/program
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset-$(UCW_ABI_MAJOR) install-libucw-charset-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset$(UCW_ABI_SUFFIX) install-libucw-charset-lib
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset-dev install-libucw-charset-api
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset-utils install-libucw-charset-utils
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-xml-$(UCW_ABI_MAJOR) install-libucw-xml-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-xml$(UCW_ABI_SUFFIX) install-libucw-xml-lib
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-xml-dev install-libucw-xml-api
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images-$(UCW_ABI_MAJOR) install-libucw-images-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images$(UCW_ABI_SUFFIX) install-libucw-images-lib
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images-dev install-libucw-images-api
        $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images-utils install-libucw-images-utils
 

diff --git a/images/Makefile b/images/Makefile
index 11a4fcf81cd2cf499e39148a303a7f5e27ec4170..60493fc7216e5d5f203b7eb9bf7d6f6b764fc71a 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -16,10 +16,10 @@ LIBIMAGES_DEPS=$(LIBUCW)
 endif
 
 ifdef CONFIG_STATIC_PIC
-LIBIMAGES_DEPS+=$(o)/images/libucw-images-pic.a
+LIBIMAGES_DEPS+=$(o)/images/libucw-images$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/images/libucw-images.pc: $(addprefix $(o)/images/libucw-images,.a -pic.a .so)
+$(o)/images/libucw-images.pc: $(addprefix $(o)/images/libucw-images$(LV),.a -pic.a .so)
 endif
 
 ifdef CONFIG_IMAGES_DUP
@@ -67,10 +67,10 @@ endif
 PROGS+=$(LIBIMAGES_PROGS)
 CONFIGS+=$(LIBIMAGES_CONFIGS)
 
-$(o)/images/libucw-images.a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
-$(o)/images/libucw-images-pic.a: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
-$(o)/images/libucw-images.so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
-$(o)/images/libucw-images.so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
+$(o)/images/libucw-images$(LV).a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
+$(o)/images/libucw-images$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
+$(o)/images/libucw-images$(LV).so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
+$(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 $(o)/images/libucw-images.pc: $(LIBIMAGES_DEPS)
 
 $(o)/images/ucw-image-tool: $(o)/images/ucw-image-tool.o $(LIBIMAGES)
@@ -95,7 +95,7 @@ run/lib/pkgconfig/libucw-images.pc: $(o)/images/libucw-images.pc
 INSTALL_TARGETS+=install-libucw-images-lib
 install-libucw-images-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw-images.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images.so.$(UCW_ABI_VERSION)
+       install -m 644 run/lib/libucw-images$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-images-lib
 
 INSTALL_TARGETS+=install-libucw-images-api
@@ -103,9 +103,9 @@ install-libucw-images-api:
        install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_INCLUDE_DIR)/images $(INSTALL_LIB_DIR) $(INSTALL_PKGCONFIG_DIR))
        install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images
        install -m 644 run/lib/pkgconfig/libucw-images.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-       ln -sf libucw-images.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images.so
-       install -m 644 run/lib/libucw-images.a $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw-images-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
+       ln -sf libucw-images$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so
+       install -m 644 run/lib/libucw-images$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+       install -m 644 run/lib/libucw-images$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-images-api
 
 INSTALL_TARGETS+=install-libucw-images-utils

diff --git a/images/libucw-images.pc b/images/libucw-images.pc
index 2b407e9091a8cf58caa5296f17fcf1496ad91c37..3c54e1f2bcd9b9e2e50e366a2eecf46dd3de23dc 100644 (file)
--- a/images/libucw-images.pc
+++ b/images/libucw-images.pc
@@ -8,7 +8,7 @@ picsuffix=
 
 Name: libucw-images
 Description: UCW image library
-Version: @UCW_ABI_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} -lucw-images${picsuffix} -lm -lpthread @LIBIMAGES_LIBS@
+Libs: -L${libdir} -lucw-images@UCW_ABI_SUFFIX@${picsuffix} -lm -lpthread @LIBIMAGES_LIBS@
 Requires: @DEPS@

diff --git a/ucw/Makefile b/ucw/Makefile
index e9294dffcee8c81875f712fca37ef36d93c33b63..c62bf3455e03350ba6d6d02b5eb75e88c1420369 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -87,16 +87,16 @@ include $(s)/ucw/doc/Makefile
 
 LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
 
-$(o)/ucw/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw.so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
+$(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV)-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 
 ifdef CONFIG_STATIC_PIC
-$(o)/ucw/libucw.pc: $(o)/ucw/libucw-pic.a
+$(o)/ucw/libucw.pc: $(o)/ucw/libucw$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw,.a -pic.a .so)
+$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a -pic.a .so)
 endif
 
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
@@ -188,7 +188,7 @@ CONFIGS+=libucw
 INSTALL_TARGETS+=install-libucw-lib
 install-libucw-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so.$(UCW_ABI_VERSION)
+       install -m 644 run/lib/libucw$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-lib
 
 INSTALL_TARGETS+=install-libucw-api
@@ -196,9 +196,9 @@ install-libucw-api:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
        install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
        install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-       ln -sf libucw.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so
-       install -m 644 run/lib/libucw.a $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
+       ln -sf libucw$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so
+       install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+       install -m 644 run/lib/libucw$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-api
 
 INSTALL_TARGETS+=install-libucw-config

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 0b643184f0bbc20c888ea82596548bbc1949e258..a13c47bffb7c610aa6762876c516285999b0131e 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -4,7 +4,10 @@
 # Version of the whole package
 Set("UCW_VERSION" => "5.0-dev");
 Set("UCW_VERSION_CODE" => 5000000);
-Set("UCW_ABI_VERSION" => Get("UCW_VERSION_CODE") . ".0");
+
+# Name of libraries in packages (libucw$UCW_ABI_SUFFIX.so.$UCW_ABI_VERSION, etc.)
+Set("UCW_ABI_SUFFIX" => "-" . Get("UCW_VERSION"));
+Set("UCW_ABI_VERSION" => "0.0");
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");

diff --git a/ucw/libucw.pc b/ucw/libucw.pc
index 3b4a092fb846ad882673379ff327d1d958dbec11..afaee036d5a4b28e41c5f3bc679de997998b42a5 100644 (file)
--- a/ucw/libucw.pc
+++ b/ucw/libucw.pc
@@ -30,6 +30,6 @@ build_system=@INSTALL_SHARE_DIR@/ucw/build
 
 Name: libucw
 Description: A library of utility functions and data structures
-Version: @UCW_ABI_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} -lucw${picsuffix} ${threads} ${regex} ${rt}
+Libs: -L${libdir} -lucw@UCW_ABI_SUFFIX@${picsuffix} ${threads} ${regex} ${rt}

diff --git a/xml/Makefile b/xml/Makefile
index 74b3ad1c56966aa0edb3ab28cff8f96388c6c382..0b261a96fe3b11ae8d96b39aa6aa50cda88d2e61 100644 (file)
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -9,17 +9,17 @@ LIBXML_INCLUDES=xml.h dtd.h
 
 LIBXML_MOD_PATHS=$(addprefix $(o)/xml/,$(LIBXML_MODS))
 
-$(o)/xml/libucw-xml.a: $(addsuffix .o,$(LIBXML_MOD_PATHS))
-$(o)/xml/libucw-xml-pic.a: $(addsuffix .oo,$(LIBXML_MOD_PATHS))
-$(o)/xml/libucw-xml.so: $(addsuffix .oo,$(LIBXML_MOD_PATHS))
-$(o)/xml/libucw-xml.so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
+$(o)/xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS))
+$(o)/xml/libucw-xml$(LV)-pic.a: $(addsuffix .oo,$(LIBXML_MOD_PATHS))
+$(o)/xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS))
+$(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 $(o)/xml/libucw-xml.pc: $(LIBCHARSET)
 
 ifdef CONFIG_STATIC_PIC
-$(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml-pic.a
+$(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/xml/libucw-xml.pc: $(addprefix $(o)/xml/libucw-xml,.a -pic.a .so)
+$(o)/xml/libucw-xml.pc: $(addprefix $(o)/xml/libucw-xml$(LV),.a -pic.a .so)
 endif
 
 $(o)/xml/common.o: $(o)/xml/unicat.h
@@ -48,7 +48,7 @@ run/lib/pkgconfig/libucw-xml.pc: $(o)/xml/libucw-xml.pc
 INSTALL_TARGETS+=install-libucw-xml-lib
 install-libucw-xml-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw-xml.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml.so.$(UCW_ABI_VERSION)
+       install -m 644 run/lib/libucw-xml$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-xml-lib
 
 INSTALL_TARGETS+=install-libucw-xml-api
@@ -56,7 +56,7 @@ install-libucw-xml-api:
        install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
        install -m 644 run/lib/pkgconfig/libucw-xml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
        install -m 644 $(addprefix run/include/xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml
-       ln -sf libucw-xml.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml.so
-       install -m 644 run/lib/libucw-xml.a $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/lib/libucw-xml-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
+       ln -sf libucw-xml$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so
+       install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+       install -m 644 run/lib/libucw-xml$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-xml-api

diff --git a/xml/libucw-xml.pc b/xml/libucw-xml.pc
index 2115af955c880a28000b2907b6b73c43e73450b7..82ee17662a27bd0871a58aa655dda220324a4a8d 100644 (file)
--- a/xml/libucw-xml.pc
+++ b/xml/libucw-xml.pc
@@ -8,7 +8,7 @@ picsuffix=
 
 Name: libucw-xml
 Description: XML parser for LibUCW project
-Version: @UCW_ABI_VERSION@
+Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} -lucw-xml${picsuffix}
+Libs: -L${libdir} -lucw-xml@UCW_ABI_SUFFIX@${picsuffix}
 Requires: @DEPS@