X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sherlock%2Fxml%2FMakefile;h=8b9af859debedd9fdd027105702f2e980f1b5c98;hb=99dbc539d5ce9a0b119e7b59ed943c129f617ec0;hp=3c70a9b025a37d44ce520fcb79cf12438eb5b0a4;hpb=98b387050c8cddb1f074ddbbbb51f1e8aa4df79d;p=libucw.git

diff --git a/sherlock/xml/Makefile b/sherlock/xml/Makefile
index 3c70a9b0..8b9af859 100644
--- a/sherlock/xml/Makefile
+++ b/sherlock/xml/Makefile
@@ -2,18 +2,36 @@
 # (c) 2007 Pavel Charvat <pchar@ucw.cz>
 
 DIRS+=sherlock/xml
+PROGS+=$(o)/sherlock/xml/xml-test
 
-LIBSH_MODS+=xml/xml
-LIBSH_XML_INCLUDES=xml/xml.h
+LIBSHXML_MODS=common source parse dtd
+LIBSHXML_INCLUDES=xml.h dtd.h
 
-$(o)/sherlock/xml/xml-t: $(LIBSH) $(LIBCHARSET)
-$(o)/sherlock/xml/xml.o: $(o)/sherlock/xml/xml-ucat.h
-$(o)/sherlock/xml/xml-ucat.h: $(s)/sherlock/xml/xml-ucat.pl
-	$(M)GEN $@
-	$(Q)$< >$@
+LIBSHXML_MOD_PATHS=$(addprefix $(o)/sherlock/xml/,$(LIBSHXML_MODS))
 
+$(o)/sherlock/xml/libshxml.a: $(addsuffix .o,$(LIBSHXML_MOD_PATHS))
+$(o)/sherlock/xml/libshxml.so: $(addsuffix .oo,$(LIBSHXML_MOD_PATHS))
+$(o)/sherlock/xml/libshxml.pc: $(LIBSH) $(LIBCHARSET)
+
+$(o)/sherlock/xml/common.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/common.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/source.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/source.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/dtd.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/dtd.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/parse.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/parse.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/unicat.h: $(s)/sherlock/xml/unicat.pl
+	$(M)GEN $(addprefix $(o)/sherlock/xml/unicat,.h .c)
+	$(Q)$< $(addprefix $(o)/sherlock/xml/unicat,.h .c)
+	$(Q)touch $@
+
+TESTS+=$(o)/sherlock/xml/xml-test.test
+$(o)/sherlock/xml/xml-test: $(o)/sherlock/xml/xml-test.o $(LIBSHXML)
+$(o)/sherlock/xml/xml-test.test: $(o)/sherlock/xml/xml-test
+
+API_LIBS+=libshxml
 API_INCLUDES+=$(o)/sherlock/xml/.include-stamp
-$(o)/sherlock/xml/.include-stamp: $(addprefix $(s)/sherlock/xml/,$(LIBSH_XML_INCLUDES))
+$(o)/sherlock/xml/.include-stamp: $(addprefix $(s)/sherlock/xml/,$(LIBSHXML_INCLUDES))
 $(o)/sherlock/xml/.include-stamp: IDST=sherlock/xml
-
-include $(s)/sherlock/perl/Makefile
+run/lib/pkgconfig/libshxml.pc: $(o)/sherlock/xml/libshxml.pc