Necko changes.

xpcom/tests/Makefile.in

@@ -41,16 +41,21 @@ CPPSRCS		=		\
 	PropertiesTest.cpp	\
 	TestAutoLock.cpp	\
 	TestObserverService.cpp	\
+	TestBuffers.cpp		\
+	TestPipes.cpp		\
+	TestThreads.cpp		\
+	$(NULL)
+
+ifndef NECKO
+CPPSRCS += 			\
 	SizeTest01.cpp		\
 	SizeTest02.cpp		\
 	SizeTest03.cpp		\
 	SizeTest04.cpp		\
 	SizeTest05.cpp		\
 	SizeTest06.cpp		\
-	TestBuffers.cpp		\
-	TestPipes.cpp		\
-	TestThreads.cpp		\
 	$(NULL)
+endif
 
 include $(topsrcdir)/config/config.mk
 
@@ -79,6 +84,21 @@ NETLIB_LIBS =	      \
 LIBS		= \
 	-lraptorgfx	\
 	-lgfx$(MOZ_TOOLKIT) \
+	$(TK_LIBS) \
+	-lpref \
+	-lsecfree \
+	-l$(MOZ_LIB_JS_PREFIX)js \
+	-limg \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
+	-lxp \
+	-lxpcom \
+	$(ZLIB_LIBS) \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+ifndef NECKO
+LIBS += 	\
+	-lgfxps \
 	-lnetlib \
 	-labouturl \
 	-lfileurl \
@@ -92,17 +112,13 @@ LIBS		= \
 	-lhttpurl \
 	-lnetwork \
 	-lnetcache \
-	$(TK_LIBS) \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-limg \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-lxp \
-	-lxpcom \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
 	$(NULL)
+else
+LIBS += 	\
+	-lneckoutil_s \
+	$(NULL)
+endif
+
 
 SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))