ifdef CONFIG_CHARSET
LIBCHARSET=$(o)/charset/libcharset.pc
endif
-ifdef CONFIG_SHXML
-LIBSHXML=$(o)/shxml/libshxml.pc
-endif
# The UCW library
include $(s)/ucw/Makefile
include $(s)/images/Makefile
endif
+ifdef CONFIG_SHXML
+LIBSHXML=$(o)/shxml/libshxml.pc
+include $(s)/shxml/Makefile
+endif
+
# Build documentation by default?
ifdef CONFIG_DOC
all: docs
# Libcharset
Set("CONFIG_CHARSET");
+# Libshxml
+Set("CONFIG_SHXML");
+
# Return success
1;
$(o)/shxml/libshxml.a: $(addsuffix .o,$(LIBSHXML_MOD_PATHS))
$(o)/shxml/libshxml.so: $(addsuffix .oo,$(LIBSHXML_MOD_PATHS))
-$(o)/shxml/libshxml.pc: $(LIBSH) $(LIBCHARSET)
+$(o)/shxml/libshxml.pc: $(LIBCHARSET)
$(o)/shxml/common.o: $(o)/shxml/unicat.h
$(o)/shxml/common.oo: $(o)/shxml/unicat.h
#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
-#include "sherlock/xml/internals.h"
+#include "ucw/lib.h"
+#include "shxml/xml.h"
+#include "shxml/dtd.h"
+#include "shxml/internals.h"
#include "ucw/stkstring.h"
#include "ucw/ff-unicode.h"
#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
-#include "sherlock/xml/internals.h"
+#include "ucw/lib.h"
+#include "shxml/xml.h"
+#include "shxml/dtd.h"
+#include "shxml/internals.h"
#include "ucw/fastbuf.h"
#include "ucw/ff-unicode.h"
#include "ucw/unicode.h"
#ifndef _SHERLOCK_XML_DTD_H
#define _SHERLOCK_XML_DTD_H
-#include "sherlock/xml/xml.h"
+#include "shxml/xml.h"
struct xml_dtd {
struct mempool *pool; /* Memory pool where to allocate DTD */
#ifndef _SHERLOCK_XML_INTERNALS_H
#define _SHERLOCK_XML_INTERNALS_H
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
+#include "shxml/xml.h"
+#include "shxml/dtd.h"
/*** Debugging ***/
xml_fatal_nested(ctx);
}
-#include "obj/sherlock/xml/unicat.h"
+#include "obj/shxml/unicat.h"
static inline uns
xml_char_cat(uns c)
#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
-#include "sherlock/xml/internals.h"
+#include "ucw/lib.h"
+#include "shxml/xml.h"
+#include "shxml/dtd.h"
+#include "shxml/internals.h"
#include "ucw/fastbuf.h"
#include "ucw/ff-unicode.h"
#include "ucw/unicode.h"
#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
-#include "sherlock/xml/internals.h"
+#include "ucw/lib.h"
+#include "shxml/xml.h"
+#include "shxml/dtd.h"
+#include "shxml/internals.h"
#include "ucw/unicode.h"
#include "ucw/ff-unicode.h"
#include "charset/charconv.h"
/*** Charecter categorization ***/
-#include "obj/sherlock/xml/unicat.c"
+#include "obj/shxml/unicat.c"
static void
xml_init_cats(struct xml_context *ctx)
* of the GNU Lesser General Public License.
*/
-#include "sherlock/sherlock.h"
-#include "sherlock/xml/xml.h"
-#include "sherlock/xml/dtd.h"
+#include "ucw/lib.h"
+#include "shxml/xml.h"
+#include "shxml/dtd.h"
#include "ucw/getopt.h"
#include "ucw/fastbuf.h"
# Tests for the XML parser
# (c) 2008 Pavel Charvat <pchar@ucw.cz>
-Run: ../obj/sherlock/xml/xml-test
+Run: ../obj/shxml/xml-test
In: <?xml version="1.0"?>
<html></html>
Out: PULL: start
PULL: eof
-Run: ../obj/sherlock/xml/xml-test -s
+Run: ../obj/shxml/xml-test -s
In: <?xml version="1.0" encoding="ISO-8859-1"?>
<html><a a1="val1" a2="val2">text1&amp;<</a>text2</html>
Out: PULL: start
SAX: document_end
PULL: eof
-Run: ../obj/sherlock/xml/xml-test -sptd
+Run: ../obj/shxml/xml-test -sptd
In: <?xml version="1.0"?>
<!DOCTYPE root [
<!ELEMENT root (#PCDATA|a)*>