Fix sun brain damage.

widget/tests/scribble/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,8 +13,9 @@
 # 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@
@@ -23,65 +23,63 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
-PROGRAM	= scribble
+PROGRAM = scribble
 
-CPPSRCS := \
+CPPSRCS = \
 	Scribble.cpp    \
 	main.cpp	\
 	$(NULL)
 
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
+ifndef NECKO
+NET_LIBS = 	\
+	-lnetlib \
+	-lremoturl \
+	-lnetcnvts \
+	-lgophurl \
+	-labouturl \
+	-lsockstuburl \
+	-lhttpurl \
+	-lmimetype \
+	-lfileurl \
+	-lftpurl \
+	-lpwcac \
+	-lnetwork \
+	-lnetcache \
+	$(NULL)
+
+else
+NET_LIBS = 	\
+	-lneckoutil_s \
+	$(NULL)
 endif
 
-LIBS := \
+LIBS = \
 	-lpref \
-	-lxmltok \
-	-lexpat \
+	-lsecfree \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
+	-limg \
+	$(PNG_LIBS) \
+	$(JPEG_LIBS) \
+	-lxpcom \
+	-lreg \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 	-lraptorgfx \
 	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 	$(TIMER_LIBS) \
-	-lraptorhtmlpars \
-	-lraptorview \
-	-limg \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	$(JSJ_LIB) \
-	-lsecfree \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-lxpcom \
 	-lxp \
-	-lreg \
+	-lraptorhtmlpars \
+	-lexpat \
+	-lxmltok \
+	-ljsurl \
+	-ljsdom \
+	$(NET_LIBS) \
 	$(ZLIB_LIBS) \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm \
-	$(TK_LIBS) \
 	$(NSPR_LIBS) \
+	$(TK_LIBS) \
 	$(NULL)
 
-ifndef NECKO
-LIBS += \
-	-lremoturl \
-	-lmimetype \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lhttpurl \
-	-lnetcache \
-	-lnetcnvts \
-	-lnetlib \
-	-lsockstuburl \
-	-lnetwork \
-	-lpwcac \
-        $(NULL)
-else
-LIBS += \
-	-lneckoutil_s \
-        $(NULL)
-endif
-
 CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
-