diff --git a/extensions/transformiix/build/Makefile.in b/extensions/transformiix/build/Makefile.in index 639522a556b..22c06e29e0c 100644 --- a/extensions/transformiix/build/Makefile.in +++ b/extensions/transformiix/build/Makefile.in @@ -109,10 +109,6 @@ OBJS =../source/base/ArrayList.o \ ../source/xml/util/DOMHelper.o \ ../source/xml/parser/XMLParser.o \ ../source/xml/parser/nsSyncLoader.o \ - ../source/xml/parser/hashtable.o \ - ../source/xml/parser/xmlrole.o \ - ../source/xml/parser/xmlparse.o \ - ../source/xml/parser/xmltok.o \ ../source/xslt/OutputFormat.o \ ../source/xslt/Names.o \ ../source/xslt/Numbering.o \ @@ -135,7 +131,7 @@ INCLUDES += -I$(srcdir)/../source/xslt -I$(srcdir)/../source/base \ -I$(srcdir)/../source/net \ -I$(srcdir)/../source/xml -I$(srcdir)/../source/xml/dom \ -I$(srcdir)/../source/xml/util \ - -I$(srcdir)/../source/xml/parser -I$(srcdir)/../source/xml/parser/xmlparse \ + -I$(srcdir)/../source/xml/parser \ -I$(srcdir)/../source/xml/printer -I$(srcdir)/../source/xpath \ -I$(srcdir)/../source/xslt/util -I$(srcdir)/../source/xslt/functions diff --git a/extensions/transformiix/source/Makefile b/extensions/transformiix/source/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/Makefile.in b/extensions/transformiix/source/Makefile.in index 0c0e62522f7..7e4af069c47 100644 --- a/extensions/transformiix/source/Makefile.in +++ b/extensions/transformiix/source/Makefile.in @@ -30,8 +30,6 @@ DIRS = base net xml xpath xslt ifndef MOZ_XSL DIRS += main -else -DIRS += examples endif include $(topsrcdir)/config/rules.mk diff --git a/extensions/transformiix/source/base/Makefile b/extensions/transformiix/source/base/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/makefile.win b/extensions/transformiix/source/makefile.win index 70cc0dad748..167d7a00fe5 100644 --- a/extensions/transformiix/source/makefile.win +++ b/extensions/transformiix/source/makefile.win @@ -25,8 +25,6 @@ DIRS=base net xml xpath xslt !ifndef MOZ_XSL DIRS = $(DIRS) main -!else -DIRS = $(DIRS) examples\mozilla\Transformiix !endif include <$(DEPTH)\config\rules.mak> diff --git a/extensions/transformiix/source/net/Makefile b/extensions/transformiix/source/net/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xml/Makefile b/extensions/transformiix/source/xml/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xml/dom/mozImpl/Makefile b/extensions/transformiix/source/xml/dom/mozImpl/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xml/dom/standalone/Makefile b/extensions/transformiix/source/xml/dom/standalone/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xml/parser/Makefile b/extensions/transformiix/source/xml/parser/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xml/parser/Makefile.in b/extensions/transformiix/source/xml/parser/Makefile.in index 47065ed8baf..4c13d31a45d 100644 --- a/extensions/transformiix/source/xml/parser/Makefile.in +++ b/extensions/transformiix/source/xml/parser/Makefile.in @@ -31,12 +31,19 @@ MODULE = transformiix REQUIRES = string xpcom necko dom layout widget webbrwsr endif -CSRCS = xmltok.c xmlrole.c xmlparse.c hashtable.c CPPSRCS = XMLParser.cpp +ifdef MOZ_XSL +CPPSRCS += nsSyncLoader.cpp +else +CSRCS = xmltok.c xmlrole.c xmlparse.c hashtable.c +endif include $(topsrcdir)/config/rules.mk +INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net -I$(srcdir)/../dom +ifndef MOZ_XSL +INCLUDES += -I$(srcdir)/xmlparse COMPILE_CFLAGS += -DXML_UNICODE -I$(srcdir)/xmltok -INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net -I$(srcdir)/../dom -I$(srcdir)/xmlparse +endif install:: $(OBJS) diff --git a/extensions/transformiix/source/xml/printer/Makefile b/extensions/transformiix/source/xml/printer/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xml/util/Makefile b/extensions/transformiix/source/xml/util/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xpath/Makefile b/extensions/transformiix/source/xpath/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xslt/Makefile b/extensions/transformiix/source/xslt/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xslt/functions/Makefile b/extensions/transformiix/source/xslt/functions/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/transformiix/source/xslt/util/Makefile b/extensions/transformiix/source/xslt/util/Makefile deleted file mode 100644 index e69de29bb2d..00000000000