Fix for FreeBSD 2.x.

htmlparser/robot/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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
@@ -14,56 +13,57 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= htmlrobot
 
-CPPSRCS = \
+CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
-	nsDebugRobot.cpp	\
-	nsRobotSink.cpp		\
-	$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
+LIBS		= \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-lnetlib \
+		-lftpurl \
+		-lfileurl \
+		-labouturl \
+		-lgophurl \
+		-lremoturl \
+		-lnetcnvts \
+		-lnetwork \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcache \
+		-lhttpurl \
+		-lpwcac \
+		-lsecfree \
+		-lpref \
+		-lxp \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lgfx$(MOZ_TOOLKIT) \
+		-lraptorgfx \
+		-lgfxps \
+		-limg	\
+		-lmozutil \
+		-lxpcom \
+		-lreg \
+		$(TK_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
-LIBS = \
+# Needed to resolve __yylex (?)
-	-lraptorhtmlpars \
+ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
-	-lexpat \
+LIBS		+= -lpcap
-	-lxmltok \
+endif
-	-lnetlib \
-	-lftpurl \
-	-lfileurl \
-	-labouturl \
-	-lgophurl \
-	-lremoturl \
-	-lnetcnvts \
-	-lnetwork \
-	-lsockstuburl \
-	-lmimetype \
-	-lnetcache \
-	-lhttpurl \
-	-lpwcac \
-	-lsecfree \
-	-lpref \
-	-lxp \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lgfx$(MOZ_TOOLKIT)    \
-	-lraptorgfx \
-	-lgfxps \
-	-limg	\
-	-lmozutil	\
-	-lxpcom \
-	-lreg \
-	$(TK_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-PROGRAM = htmlrobot
 
 include $(topsrcdir)/config/rules.mk

parser/htmlparser/robot/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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
@@ -14,56 +13,57 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= htmlrobot
 
-CPPSRCS = \
+CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
-	nsDebugRobot.cpp	\
-	nsRobotSink.cpp		\
-	$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
+LIBS		= \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-lnetlib \
+		-lftpurl \
+		-lfileurl \
+		-labouturl \
+		-lgophurl \
+		-lremoturl \
+		-lnetcnvts \
+		-lnetwork \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcache \
+		-lhttpurl \
+		-lpwcac \
+		-lsecfree \
+		-lpref \
+		-lxp \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lgfx$(MOZ_TOOLKIT) \
+		-lraptorgfx \
+		-lgfxps \
+		-limg	\
+		-lmozutil \
+		-lxpcom \
+		-lreg \
+		$(TK_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
-LIBS = \
+# Needed to resolve __yylex (?)
-	-lraptorhtmlpars \
+ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
-	-lexpat \
+LIBS		+= -lpcap
-	-lxmltok \
+endif
-	-lnetlib \
-	-lftpurl \
-	-lfileurl \
-	-labouturl \
-	-lgophurl \
-	-lremoturl \
-	-lnetcnvts \
-	-lnetwork \
-	-lsockstuburl \
-	-lmimetype \
-	-lnetcache \
-	-lhttpurl \
-	-lpwcac \
-	-lsecfree \
-	-lpref \
-	-lxp \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lgfx$(MOZ_TOOLKIT)    \
-	-lraptorgfx \
-	-lgfxps \
-	-limg	\
-	-lmozutil	\
-	-lxpcom \
-	-lreg \
-	$(TK_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-PROGRAM = htmlrobot
 
 include $(topsrcdir)/config/rules.mk