X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=xml%2FMakefile;h=4df8de257fa1ff300063b2ea74c7ae58fc0c870a;hb=182529f4473a1d9b0b2815b6729f0f2b82ab287c;hp=4a1b2e6b7a9b10fa1a2ff034c9ad2f0653725803;hpb=94b06fc32d62e644ebda4c2148c76d65759702e6;p=libucw.git

diff --git a/xml/Makefile b/xml/Makefile
index 4a1b2e6b..4df8de25 100644
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -5,21 +5,17 @@ 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.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_VERSION)
-$(o)/xml/libucw-xml.pc: $(LIBCHARSET)
+$(o)/xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS))
+$(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-pic.a
-endif
 ifdef CONFIG_INSTALL_API
-$(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml.a $(o)/xml/libucw-xml-pic.a $(o)/xml/libucw-xml.so
+$(o)/xml/libucw-xml.pc: $(addprefix $(o)/xml/libucw-xml$(LV),.a .so)
 endif
 
 $(o)/xml/common.o: $(o)/xml/unicat.h
@@ -36,7 +32,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
@@ -45,18 +41,18 @@ $(o)/xml/.include-stamp: $(addprefix $(s)/xml/,$(LIBXML_INCLUDES))
 $(o)/xml/.include-stamp: IDST=xml
 run/lib/pkgconfig/libucw-xml.pc: $(o)/xml/libucw-xml.pc
 
-INSTALL_TARGETS+=install-libucw-xml install-libucw-xml-api
-
-install-libucw-xml:
+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_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)
+	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
 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)
-
-.PHONY: install-libucw-xml install-libucw-xml-api
+	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