Cleaned it up and changed the name of libreg.{a,so} to libmozreg.{a,so} to fix the conflict reported in bug 8568.

git-svn-id: svn://10.0.0.236/trunk@41354 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/htmlparser/robot/Makefile.in

@@ -22,6 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
+
 include $(topsrcdir)/config/config.mk
 
 ifndef NECKO
@@ -30,8 +32,6 @@ else
 LIBRARY_NAME	= DebugRobot
 endif
 
-CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
-
 ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
@@ -54,10 +54,10 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-l$(MOZ_LIB_JS_PREFIX)js \
-		-limg	\
+		-limg \
 		-lmozutil \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(ZLIB_LIBS) \
@@ -68,10 +68,9 @@ LIBS		= \
 ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
+
 else
-DIRS = test
+DIRS		= test
 endif
 
-
-
 include $(topsrcdir)/config/rules.mk

mozilla/htmlparser/robot/test/Makefile.in

@@ -13,38 +13,29 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
-
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-IGNORE_MANIFEST=1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			\
-	RobotMain.cpp 		\
-	$(NULL)
+PROGRAM		= htmlrobot
 
-BASE_LIBS =	     \
-	-lreg	     \
-	-lxpcom	     \
-	$(NULL)
+REQUIRES	= xpcom
 
-LIBS =		       \
-	-lDebugRobot	\
-	$(BASE_LIBS)   \
-	$(NSPR_LIBS)   \
-	$(NULL)
+CPPSRCS		= RobotMain.cpp
+
+LIBS		= \
+		-lDebugRobot \
+		-lmozreg \
+		-lxpcom \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
-REQUIRES=xpcom
-
-PROGRAM = htmlrobot
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk