From: Pavel Charvat Date: Mon, 21 Jan 2008 18:25:36 +0000 (+0100) Subject: All customization are compilable again. X-Git-Tag: holmes-import~458 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ab0d43c65bf187744e0f74316e533d7747990f45;p=libucw.git All customization are compilable again. --- diff --git a/sherlock/xml/Makefile b/sherlock/xml/Makefile index ffa4f047..8b9af859 100644 --- a/sherlock/xml/Makefile +++ b/sherlock/xml/Makefile @@ -14,9 +14,13 @@ $(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/parse.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) diff --git a/sherlock/xml/xml-test.t b/sherlock/xml/xml-test.t index a7a8eb9d..74162ffe 100644 --- a/sherlock/xml/xml-test.t +++ b/sherlock/xml/xml-test.t @@ -22,7 +22,7 @@ Out: PULL: start SAX: document_end PULL: eof -Run: (printf '\376\377' && bin/cs2cs UTF-8 UTF-16BE) | ../obj/sherlock/xml/xml-test -sptd +Run: ../obj/sherlock/xml/xml-test -sptd In: @@ -34,7 +34,7 @@ In: &e1;&e2; Out: PULL: start SAX: document_start - SAX: xml_decl version=1.0 standalone=0 fb_encoding=UTF-16BE + SAX: xml_decl version=1.0 standalone=0 fb_encoding=UTF-8 SAX: doctype_decl type=root public='' system='' extsub=0 intsub=1 SAX: dtd_start SAX: dtd_end