diff --git a/mozilla/htmlparser/makefile.win b/mozilla/htmlparser/makefile.win
index 78a595cef67..b62d2ab37d9 100644
--- a/mozilla/htmlparser/makefile.win
+++ b/mozilla/htmlparser/makefile.win
@@ -18,6 +18,6 @@
 DEPTH=..
 IGNORE_MANIFEST=1
 
-DIRS = src
+DIRS = src robot robot\test
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win
index 47faaffcc65..80ad280d2ae 100644
--- a/mozilla/htmlparser/robot/makefile.win
+++ b/mozilla/htmlparser/robot/makefile.win
@@ -15,20 +15,13 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\.. 
 IGNORE_MANIFEST=1
 
-MAKE_OBJ_TYPE   = EXE
-PROGRAM = .\$(OBJDIR)\htmlrobot.exe
+MAKE_OBJ_TYPE	= DLL
 
-MISCDEP=			\
- $(DIST)\lib\raptorhtmlpars.lib	\
- $(DIST)\lib\xpcom32.lib	\
- $(LIBNSPR)			\
- $(DIST)\lib\libplc21.lib	\
- $(NULL)
+DEPTH=..\..
 
-MYLIBS=				\
+LLIBS=				\
  $(DIST)\lib\raptorhtmlpars.lib	\
  $(DIST)\lib\raptorbase.lib	\
  $(DIST)\lib\xpcom32.lib	\
@@ -37,27 +30,25 @@ MYLIBS=				\
  $(DIST)\lib\netlib.lib \
  $(NULL)
 
-LLIBS= $(MYLIBS)                \
- shell32.lib                    \
- -SUBSYSTEM:CONSOLE
-
-DEFINES=-D_IMPL_NS_HTMLPARS 
+LIBNAME = .\$(OBJDIR)\DebugRobot
+DLL = $(LIBNAME).dll
 
 CPPSRCS=			\
  nsRobotSink.cpp		\
- RobotMain.cpp			\
+ nsDebugRobot.cpp		\
  $(NULL)
 
 CPP_OBJS=			\
  .\$(OBJDIR)\nsRobotSink.obj	\
- .\$(OBJDIR)\RobotMain.obj
+ .\$(OBJDIR)\nsDebugRobot.obj  \
+ $(NULL)
+
+MODULE = DebugRobot
 
 LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor  -I$(XPDIST)\public\netlib -I..\src
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(PROGRAM)
-	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
-
-clobber::
-	rm -f $(DIST)\bin\htmlrobot.exe
+libs:: $(DLL)
+	$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
+	$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
diff --git a/mozilla/htmlparser/robot/test/RobotMain.cpp b/mozilla/htmlparser/robot/test/RobotMain.cpp
new file mode 100644
index 00000000000..5cd699bcb7f
--- /dev/null
+++ b/mozilla/htmlparser/robot/test/RobotMain.cpp
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include "nsVoidArray.h"
+#include "nsString.h"
+
+extern "C" NS_EXPORT int DebugRobot(nsVoidArray * workList);
+
+int main(int argc, char **argv)
+{
+  nsVoidArray * gWorkList = new nsVoidArray();
+  int i;
+  for (i = 1; i < argc; i++) {
+    gWorkList->AppendElement(new nsString(argv[i]));
+  }
+  return DebugRobot(gWorkList);
+}
+
diff --git a/mozilla/htmlparser/robot/test/makefile.win b/mozilla/htmlparser/robot/test/makefile.win
new file mode 100644
index 00000000000..ab56a2def73
--- /dev/null
+++ b/mozilla/htmlparser/robot/test/makefile.win
@@ -0,0 +1,55 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+MAKE_OBJ_TYPE   = EXE
+PROGRAM = .\$(OBJDIR)\htmlrobot.exe
+
+MISCDEP=			\
+ $(DIST)\lib\DebugRobot.lib	\
+ $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom32.lib	\
+ $(NULL)
+
+MYLIBS=				\
+ $(DIST)\lib\DebugRobot.lib	\
+ $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom32.lib	\
+ $(NULL)
+
+LLIBS= $(MYLIBS)                \
+ shell32.lib                    \
+ -SUBSYSTEM:CONSOLE
+
+CPPSRCS=			\
+ RobotMain.cpp			\
+ $(NULL)
+
+CPP_OBJS=			\
+ .\$(OBJDIR)\RobotMain.obj
+
+LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor  -I$(XPDIST)\public\netlib -I.. 
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(PROGRAM)
+	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
+
+clobber::
+	rm -f $(DIST)\bin\htmlrobot.exe
diff --git a/mozilla/parser/htmlparser/makefile.win b/mozilla/parser/htmlparser/makefile.win
index 78a595cef67..b62d2ab37d9 100644
--- a/mozilla/parser/htmlparser/makefile.win
+++ b/mozilla/parser/htmlparser/makefile.win
@@ -18,6 +18,6 @@
 DEPTH=..
 IGNORE_MANIFEST=1
 
-DIRS = src
+DIRS = src robot robot\test
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win
index 47faaffcc65..80ad280d2ae 100644
--- a/mozilla/parser/htmlparser/robot/makefile.win
+++ b/mozilla/parser/htmlparser/robot/makefile.win
@@ -15,20 +15,13 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\.. 
 IGNORE_MANIFEST=1
 
-MAKE_OBJ_TYPE   = EXE
-PROGRAM = .\$(OBJDIR)\htmlrobot.exe
+MAKE_OBJ_TYPE	= DLL
 
-MISCDEP=			\
- $(DIST)\lib\raptorhtmlpars.lib	\
- $(DIST)\lib\xpcom32.lib	\
- $(LIBNSPR)			\
- $(DIST)\lib\libplc21.lib	\
- $(NULL)
+DEPTH=..\..
 
-MYLIBS=				\
+LLIBS=				\
  $(DIST)\lib\raptorhtmlpars.lib	\
  $(DIST)\lib\raptorbase.lib	\
  $(DIST)\lib\xpcom32.lib	\
@@ -37,27 +30,25 @@ MYLIBS=				\
  $(DIST)\lib\netlib.lib \
  $(NULL)
 
-LLIBS= $(MYLIBS)                \
- shell32.lib                    \
- -SUBSYSTEM:CONSOLE
-
-DEFINES=-D_IMPL_NS_HTMLPARS 
+LIBNAME = .\$(OBJDIR)\DebugRobot
+DLL = $(LIBNAME).dll
 
 CPPSRCS=			\
  nsRobotSink.cpp		\
- RobotMain.cpp			\
+ nsDebugRobot.cpp		\
  $(NULL)
 
 CPP_OBJS=			\
  .\$(OBJDIR)\nsRobotSink.obj	\
- .\$(OBJDIR)\RobotMain.obj
+ .\$(OBJDIR)\nsDebugRobot.obj  \
+ $(NULL)
+
+MODULE = DebugRobot
 
 LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor  -I$(XPDIST)\public\netlib -I..\src
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(PROGRAM)
-	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
-
-clobber::
-	rm -f $(DIST)\bin\htmlrobot.exe
+libs:: $(DLL)
+	$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
+	$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
diff --git a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
new file mode 100644
index 00000000000..5cd699bcb7f
--- /dev/null
+++ b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include "nsVoidArray.h"
+#include "nsString.h"
+
+extern "C" NS_EXPORT int DebugRobot(nsVoidArray * workList);
+
+int main(int argc, char **argv)
+{
+  nsVoidArray * gWorkList = new nsVoidArray();
+  int i;
+  for (i = 1; i < argc; i++) {
+    gWorkList->AppendElement(new nsString(argv[i]));
+  }
+  return DebugRobot(gWorkList);
+}
+
diff --git a/mozilla/parser/htmlparser/robot/test/makefile.win b/mozilla/parser/htmlparser/robot/test/makefile.win
new file mode 100644
index 00000000000..ab56a2def73
--- /dev/null
+++ b/mozilla/parser/htmlparser/robot/test/makefile.win
@@ -0,0 +1,55 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+MAKE_OBJ_TYPE   = EXE
+PROGRAM = .\$(OBJDIR)\htmlrobot.exe
+
+MISCDEP=			\
+ $(DIST)\lib\DebugRobot.lib	\
+ $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom32.lib	\
+ $(NULL)
+
+MYLIBS=				\
+ $(DIST)\lib\DebugRobot.lib	\
+ $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom32.lib	\
+ $(NULL)
+
+LLIBS= $(MYLIBS)                \
+ shell32.lib                    \
+ -SUBSYSTEM:CONSOLE
+
+CPPSRCS=			\
+ RobotMain.cpp			\
+ $(NULL)
+
+CPP_OBJS=			\
+ .\$(OBJDIR)\RobotMain.obj
+
+LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor  -I$(XPDIST)\public\netlib -I.. 
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(PROGRAM)
+	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
+
+clobber::
+	rm -f $(DIST)\bin\htmlrobot.exe