Build: libshxml compiles

diff --git a/Makefile b/Makefile
index 9fff0c45055d14811620ac1c48334dd398b2df36..c126cd16ee8c6a2af61e3fd5c4cbfda30598e00e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,6 @@ include $(BUILDSYS)/Makefile
 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
@@ -53,6 +50,11 @@ LIBIMAGES=$(o)/images/libimages.pc
 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

diff --git a/default.cfg b/default.cfg
index 0fd308d24a40834095aef4993b4e00d5bb7672ea..3ed4af896f0823fc59976731e9defe0c964326b2 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -28,5 +28,8 @@ UnSet("CONFIG_IMAGES_LIBMAGICK");
 # Libcharset
 Set("CONFIG_CHARSET");
 
+# Libshxml
+Set("CONFIG_SHXML");
+
 # Return success
 1;

diff --git a/shxml/Makefile b/shxml/Makefile
index d974422edcf060417200fc89bf58da8c4877d6c4..630ce6c33745767192d44c43c0102294435152c7 100644 (file)
--- a/shxml/Makefile
+++ b/shxml/Makefile
@@ -11,7 +11,7 @@ LIBSHXML_MOD_PATHS=$(addprefix $(o)/shxml/,$(LIBSHXML_MODS))
 
 $(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

diff --git a/shxml/common.c b/shxml/common.c
index 6bb2737f670dd1b1f05a028058e4405b1c0b9331..de439cbfc006619c32ad071e821ca5d60d3f535b 100644 (file)
--- a/shxml/common.c
+++ b/shxml/common.c
@@ -9,10 +9,10 @@
 
 #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"
 

diff --git a/shxml/dtd.c b/shxml/dtd.c
index 67cb7ccca08b1638eb576824f7e695ca2eae7879..7693bedb2b9eb86602592ce35c31376e24dbfabf 100644 (file)
--- a/shxml/dtd.c
+++ b/shxml/dtd.c
@@ -9,10 +9,10 @@
 
 #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"

diff --git a/shxml/dtd.h b/shxml/dtd.h
index e2caf98731ca59ea6a52647848b126ae44344142..f653363477572e3afe5a8d3925f427aa3bac1d31 100644 (file)
--- a/shxml/dtd.h
+++ b/shxml/dtd.h
@@ -10,7 +10,7 @@
 #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 */

diff --git a/shxml/internals.h b/shxml/internals.h
index bbf28c0583e58b2e7a089f3085fe637ad5eaf3d5..490c1f4523afe49b05064feb905e4d2a0f301437 100644 (file)
--- a/shxml/internals.h
+++ b/shxml/internals.h
@@ -10,8 +10,8 @@
 #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 ***/
 
@@ -143,7 +143,7 @@ xml_dec(struct xml_context *ctx)
     xml_fatal_nested(ctx);
 }
 
-#include "obj/sherlock/xml/unicat.h"
+#include "obj/shxml/unicat.h"
 
 static inline uns
 xml_char_cat(uns c)

diff --git a/shxml/parse.c b/shxml/parse.c
index 27141b142287c973d7385a9a30c37d9df9bed16f..9fb3a2eee0d93feee12ea97c45e378428faeb851 100644 (file)
--- a/shxml/parse.c
+++ b/shxml/parse.c
@@ -9,10 +9,10 @@
 
 #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"

diff --git a/shxml/source.c b/shxml/source.c
index 29226f0fa062c086667980cdd2cb7fb25ea00456..14debf01a77bc6a23a02bd14d1a21cda116f09da 100644 (file)
--- a/shxml/source.c
+++ b/shxml/source.c
@@ -9,10 +9,10 @@
 
 #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"
@@ -20,7 +20,7 @@
 
 /*** Charecter categorization ***/
 
-#include "obj/sherlock/xml/unicat.c"
+#include "obj/shxml/unicat.c"
 
 static void
 xml_init_cats(struct xml_context *ctx)

diff --git a/shxml/xml-test.c b/shxml/xml-test.c
index f6738c56db4164cd3851dfdd7c7351ebeac88812..6bd4a493f012e8e142f02a6b9c03fe8a181f53cc 100644 (file)
--- a/shxml/xml-test.c
+++ b/shxml/xml-test.c
@@ -7,9 +7,9 @@
  *     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"
 

diff --git a/shxml/xml-test.t b/shxml/xml-test.t
index aad3d43955c6353de45d4cbd4ef5d2aacc7d299d..7a04fb1b9c38bdf07ee8b0a91cd9e188e90024cb 100644 (file)
--- a/shxml/xml-test.t
+++ b/shxml/xml-test.t
@@ -1,13 +1,13 @@
 # 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;amp;&lt;</a>text2</html>
 Out:   PULL: start
@@ -22,7 +22,7 @@ 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)*>