From: Martin Mares Date: Tue, 13 Jul 2010 12:48:27 +0000 (+0200) Subject: Build: libshxml compiles X-Git-Tag: v5.0~159 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ff137100b81b60e925ac60e30c21ecc48177606a;p=libucw.git Build: libshxml compiles --- diff --git a/Makefile b/Makefile index 9fff0c45..c126cd16 100644 --- 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 0fd308d2..3ed4af89 100644 --- 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 d974422e..630ce6c3 100644 --- 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 6bb2737f..de439cbf 100644 --- 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 67cb7ccc..7693bedb 100644 --- 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 e2caf987..f6533634 100644 --- 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 bbf28c05..490c1f45 100644 --- 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 27141b14..9fb3a2ee 100644 --- 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 29226f0f..14debf01 100644 --- 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 f6738c56..6bd4a493 100644 --- 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 aad3d439..7a04fb1b 100644 --- a/shxml/xml-test.t +++ b/shxml/xml-test.t @@ -1,13 +1,13 @@ # Tests for the XML parser # (c) 2008 Pavel Charvat -Run: ../obj/sherlock/xml/xml-test +Run: ../obj/shxml/xml-test In: Out: PULL: start PULL: eof -Run: ../obj/sherlock/xml/xml-test -s +Run: ../obj/shxml/xml-test -s In: text1&amp;<text2 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: