diff --git a/htmlparser/robot/Makefile.in b/htmlparser/robot/Makefile.in
index 54ddbc892e3f..cce2b28348bb 100644
--- a/htmlparser/robot/Makefile.in
+++ b/htmlparser/robot/Makefile.in
@@ -15,43 +15,50 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../../..
+DEPTH = ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
 
-CPPSRCS =			\
-	RobotMain.cpp		\
+CPPSRCS = \
+	nsDebugRobot.cpp	\
 	nsRobotSink.cpp		\
 	$(NULL)
 
-REQUIRES=xpcom raptor
+include $(topsrcdir)/config/config.mk
 
-OBJS	= $(CPPSRCS:.cpp=.o)
 
-EX_LIBS = \
-	$(DIST)/lib/libraptorbase.a \
-	$(DIST)/lib/libraptorhtmlpars.a \
-	$(DIST)/lib/libnetlib.a \
-	$(DIST)/lib/libpref.a	\
-	$(DIST)/lib/libxp.a	\
-	$(DIST)/lib/libjs.a	\
-	$(DIST)/lib/libxpcom.a  \
-	$(NSPR_LIBS)		\
-	-lXm			\
-	-lm			\
+LIBS = \
+	-lraptorbase \
+	-lraptorhtmlpars \
+	-lnetlib \
+	-lgmbase$(MOZ_TOOLKIT) \
+	-lftpurl \
+	-lfileurl \
+	-labouturl \
+	-lgophurl \
+	-lremoturl \
+	-lnetcnvts \
+	-lnetwork \
+	-lsockstuburl \
+	-lnetutil \
+	-lmimetype \
+	-lnetcache \
+	-lhttpurl \
+	-lpwcac \
+	-lsecfree \
+	-lpref \
+	-lxp \
+	-ljs \
+	-lxpcom \
+	$(TK_LIBS) \
+	$(ZLIB_LIBS) \
+	$(NSPR_LIBS) \
 	$(NULL)
 
-PROG = htmlrobot
-
-$(PROG):$(OBJS)
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
-
-TARGETS = $(PROG)
+PROGRAM = htmlrobot
 
 include $(topsrcdir)/config/rules.mk
diff --git a/parser/htmlparser/robot/Makefile.in b/parser/htmlparser/robot/Makefile.in
index 54ddbc892e3f..cce2b28348bb 100644
--- a/parser/htmlparser/robot/Makefile.in
+++ b/parser/htmlparser/robot/Makefile.in
@@ -15,43 +15,50 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../../..
+DEPTH = ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
 
-CPPSRCS =			\
-	RobotMain.cpp		\
+CPPSRCS = \
+	nsDebugRobot.cpp	\
 	nsRobotSink.cpp		\
 	$(NULL)
 
-REQUIRES=xpcom raptor
+include $(topsrcdir)/config/config.mk
 
-OBJS	= $(CPPSRCS:.cpp=.o)
 
-EX_LIBS = \
-	$(DIST)/lib/libraptorbase.a \
-	$(DIST)/lib/libraptorhtmlpars.a \
-	$(DIST)/lib/libnetlib.a \
-	$(DIST)/lib/libpref.a	\
-	$(DIST)/lib/libxp.a	\
-	$(DIST)/lib/libjs.a	\
-	$(DIST)/lib/libxpcom.a  \
-	$(NSPR_LIBS)		\
-	-lXm			\
-	-lm			\
+LIBS = \
+	-lraptorbase \
+	-lraptorhtmlpars \
+	-lnetlib \
+	-lgmbase$(MOZ_TOOLKIT) \
+	-lftpurl \
+	-lfileurl \
+	-labouturl \
+	-lgophurl \
+	-lremoturl \
+	-lnetcnvts \
+	-lnetwork \
+	-lsockstuburl \
+	-lnetutil \
+	-lmimetype \
+	-lnetcache \
+	-lhttpurl \
+	-lpwcac \
+	-lsecfree \
+	-lpref \
+	-lxp \
+	-ljs \
+	-lxpcom \
+	$(TK_LIBS) \
+	$(ZLIB_LIBS) \
+	$(NSPR_LIBS) \
 	$(NULL)
 
-PROG = htmlrobot
-
-$(PROG):$(OBJS)
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
-
-TARGETS = $(PROG)
+PROGRAM = htmlrobot
 
 include $(topsrcdir)/config/rules.mk