UCW::CGI: Let url_param_escape() encode non-ASCII characters

[libucw.git] / xml / Makefile

diff --git a/xml/Makefile b/xml/Makefile
index 44e13c6c14990d1248218eeffdaf1f22a53d82f1..567c8a6ada2c942ebb5180ce240dd4c1668a0bba 100644 (file)
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -5,15 +5,15 @@ DIRS+=xml
 PROGS+=$(o)/xml/xml-test
 
 LIBXML_MODS=common source parse dtd
-LIBXML_INCLUDES=xml.h dtd.h
-
 LIBXML_MOD_PATHS=$(addprefix $(o)/xml/,$(LIBXML_MODS))
+LIBXML_INCLUDES=xml.h dtd.h
+LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET)
 
 $(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)
+$(o)/xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBXML_DEPS)
+$(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.0
+$(o)/xml/libucw-xml.pc: $(LIBXML_DEPS)
 
 ifdef CONFIG_STATIC_PIC
 $(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml$(LV)-pic.a
@@ -36,7 +36,7 @@ $(o)/xml/unicat.h: $(s)/xml/unicat.pl
        $(Q)touch $@
 
 TESTS+=$(o)/xml/xml-test.test
-$(o)/xml/xml-test: $(o)/xml/xml-test.o $(LIBXML)
+$(o)/xml/xml-test: $(o)/xml/xml-test.o $(LIBXML) $(LIBCHARSET) $(LIBUCW)
 $(o)/xml/xml-test.test: $(o)/xml/xml-test
 
 API_LIBS+=libucw-xml
@@ -48,8 +48,8 @@ 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$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.$(UCW_ABI_VERSION)
-       ln -sf libucw-xml$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.$(UCW_ABI_MAJOR)
+       install -m 644 run/lib/libucw-xml$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0.0
+       ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0
 .PHONY: install-libucw-xml-lib
 
 INSTALL_TARGETS+=install-libucw-xml-api
@@ -57,6 +57,6 @@ 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$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so
+       ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so
        install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-xml-api