Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / sherlock / xml / Makefile

diff --git a/sherlock/xml/Makefile b/sherlock/xml/Makefile
index f721b500d154bf9045304c273b7f20e3577dea74..a265b96d1cc66e2ac516d44c87dd0bfae9dd6805 100644 (file)
--- a/sherlock/xml/Makefile
+++ b/sherlock/xml/Makefile
@@ -2,22 +2,27 @@
 # (c) 2007 Pavel Charvat <pchar@ucw.cz>
 
 DIRS+=sherlock/xml
+PROGS+=$(o)/sherlock/xml/xml-test
 
-LIBSHXML_MODS=xml
+LIBSHXML_MODS=common source parse dtd
 LIBSHXML_INCLUDES=xml.h dtd.h
 
 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: $(LIBUCW) $(LIBCHARSET)
+$(o)/sherlock/xml/libshxml.pc: $(LIBSH) $(LIBCHARSET)
 
-$(o)/sherlock/xml/xml-t: $(LIBSHXML)
-$(o)/sherlock/xml/xml.o: $(o)/sherlock/xml/unicat.h
-$(o)/sherlock/xml/unicat.h: $(s)/sherlock/xml/unicat.pl
-       $(M)GEN $@
-       $(Q)$< >$@
+$(o)/sherlock/xml/common.o $(o)/sherlock/xml/unicat.h: $(o)/sherlock/xml/unicat.stamp
+$(o)/sherlock/xml/unicat.stamp: $(s)/sherlock/xml/unicat.pl
+       $(M)GEN $(addprefix $(o)/sherlock/xml/unicat,.h .c)
+       $(Q)$< $(addprefix $(o)/sherlock/xml/unicat,.h .c)
+       $(Q)touch $@
 
+$(o)/sherlock/xml/xml-test: $(o)/sherlock/xml/xml-test.o $(LIBSHXML)
+
+API_LIBS+=libshxml
 API_INCLUDES+=$(o)/sherlock/xml/.include-stamp
 $(o)/sherlock/xml/.include-stamp: $(addprefix $(s)/sherlock/xml/,$(LIBSHXML_INCLUDES))
 $(o)/sherlock/xml/.include-stamp: IDST=sherlock/xml
+run/lib/pkgconfig/libshxml.pc: $(o)/sherlock/xml/libshxml.pc