Released as 6.5.16.

[libucw.git] / ucw-xml / Makefile

diff --git a/ucw-xml/Makefile b/ucw-xml/Makefile
index 28083ccdc5e4e012fc79a19997d317b29fc15720..9f339b2fbcc12b5452bca22ce976b32eb0159e89 100644 (file)
--- a/ucw-xml/Makefile
+++ b/ucw-xml/Makefile
@@ -4,7 +4,7 @@
 DIRS+=ucw-xml
 PROGS+=$(o)/ucw-xml/xml-test
 
-LIBXML_MODS=common source parse dtd
+LIBXML_MODS=common source parse dtd ns
 LIBXML_MOD_PATHS=$(addprefix $(o)/ucw-xml/,$(LIBXML_MODS))
 LIBXML_INCLUDES=xml.h dtd.h
 LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET)
@@ -18,14 +18,8 @@ ifdef CONFIG_INSTALL_API
 $(o)/ucw-xml/libucw-xml.pc: $(addprefix $(o)/ucw-xml/libucw-xml$(LV),.a .so)
 endif
 
-$(o)/ucw-xml/common.o: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/common.oo: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/source.o: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/source.oo: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/dtd.o: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/dtd.oo: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/parse.o: $(o)/ucw-xml/unicat.h
-$(o)/ucw-xml/parse.oo: $(o)/ucw-xml/unicat.h
+$(addsuffix .o,$(LIBXML_MOD_PATHS)): $(o)/ucw-xml/unicat.h
+$(addsuffix .oo,$(LIBXML_MOD_PATHS)): $(o)/ucw-xml/unicat.h
 $(o)/ucw-xml/unicat.h: $(s)/ucw-xml/unicat.pl
        $(M)GEN $(addprefix $(o)/ucw-xml/unicat,.h .c)
        $(Q)$< $(addprefix $(o)/ucw-xml/unicat,.h .c)
@@ -50,9 +44,11 @@ install-libucw-xml-lib:
 
 INSTALL_TARGETS+=install-libucw-xml-api
 install-libucw-xml-api:
-       install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+       install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw-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/ucw-xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml
+       install -m 644 $(addprefix run/include/ucw-xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw-xml
        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
+
+include $(s)/ucw-xml/doc/Makefile