72141 (Enable XSLT in default builds) and 74879 (Makefiles must die). r=nisheeth, sr=jst.

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
 

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

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>

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)