Updated makefile.solaris to use workshop compilers.

java/webclient/src/Makefile.solaris

@@ -20,10 +20,10 @@ INCLUDE = ${JAVAINCLUDE} -I${DIST}/include ${GTKINCLUDES} ${GTKMOZILLAINCLUDE}
 DEFINES = -D_REENTRANT -DNECKO -DXP_UNIX -DDEBUG_RAPTOR_CANVAS -DMOZ_DLL_SUFFIX=\".so\"
 STUBDEFINES = -D_REENTRANT
 STUBINCLUDE = ${JAVAINCLUDE}
-STUBLIBS = ${JAVALIBS}
+STUBLIBS = ${JAVALIBS} -lC
 # For the latest mozilla build
 LIBS =  ${GTKLIBS} ${JAVALIBS} \
--L${DIST}/bin -lraptorgfx -lexpat -lxmltok -ljsurl -lmozdbm -lmozjs -lsecfree -lmozutil -lnspr3 -lxp -ljpeg -lpng -lz -lpthread -lXm -lXt -L${DIST}/lib -lxpcom -limg -lplds3 -lgfx_gtk -lraptorwebwidget -lraptorhtmlpars -lraptorplugin -lpref -lplds3 -lplc3 -ljsdom -L${DIST}/lib -ltimer_gtk_s
+-L${DIST}/bin -lraptorgfx -lexpat -lxmltok -ljsurl -lmozdbm -lmozjs -lsecfree -lmozutil -lnspr3 -lxp -ljpeg -lpng -lz -lpthread -lXm -lXt -L${DIST}/lib -lxpcom -limg -lplds3 -lgfx_gtk -lraptorwebwidget -lraptorhtmlpars -lraptorplugin -lpref -lplds3 -lplc3 -ljsdom -L${DIST}/lib -ltimer_gtk_s -lC
 LN = ln -f -s
 
 all: libwebclientstub.so libwebclient.so component.reg components
@@ -35,25 +35,25 @@ components:
 	${LN} ${DIST}/bin/components
 
 libwebclientstub.so: BrowserControlMozillaShimStub.o MotifBrowserControlCanvasStub.o
-	ld -G -o ${DLLNAMESTUB} BrowserControlMozillaShimStub.o MotifBrowserControlCanvasStub.o ${STUBLIBS}
+	cc -G -o ${DLLNAMESTUB} BrowserControlMozillaShimStub.o MotifBrowserControlCanvasStub.o ${STUBLIBS}
 
 libwebclient.so: BrowserControlMozillaShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o
-	ld -G -o ${DLLNAME} BrowserControlMozillaShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o ${LIBS}
+	cc -G -o ${DLLNAME} BrowserControlMozillaShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o ${LIBS}
 
 gtkmozilla.o: motif/gtkmozilla.cpp
-	g++ ${DEFINES} ${INCLUDE} -c motif/gtkmozilla.cpp
+	CC ${DEFINES} ${INCLUDE} -c motif/gtkmozilla.cpp
 
 MotifBrowserControlCanvasStub.o: motif/MotifBrowserControlCanvasStub.cpp
-	g++ ${STUBDEFINES} ${STUBINCLUDE} -c motif/MotifBrowserControlCanvasStub.cpp
+	CC ${STUBDEFINES} ${STUBINCLUDE} -c motif/MotifBrowserControlCanvasStub.cpp
 
 MotifBrowserControlCanvas.o: motif/MotifBrowserControlCanvas.cpp
-	g++ ${DEFINES} ${INCLUDE} -c motif/MotifBrowserControlCanvas.cpp
+	CC ${DEFINES} ${INCLUDE} -c motif/MotifBrowserControlCanvas.cpp
 
 BrowserControlMozillaShimStub.o: motif/BrowserControlMozillaShimStub.cpp
-	g++ ${STUBDEFINES} ${STUBINCLUDE} -c motif/BrowserControlMozillaShimStub.cpp
+	CC ${STUBDEFINES} ${STUBINCLUDE} -c motif/BrowserControlMozillaShimStub.cpp
 
 BrowserControlMozillaShim.o: BrowserControlMozillaShim.cpp
-	g++ ${DEFINES} ${INCLUDE} -c BrowserControlMozillaShim.cpp
+	CC ${DEFINES} ${INCLUDE} -c BrowserControlMozillaShim.cpp
 
 motif/nsSetupRegistry.cpp:
 	cd motif
@@ -62,10 +62,10 @@ motif/nsSetupRegistry.cpp:
 
 #PENDING(mark): I think we should use this for the Win32 version as well...
 nsSetupRegistry.o: motif/nsSetupRegistry.cpp
-	g++ ${DEFINES} ${INCLUDE} -c motif/nsSetupRegistry.cpp
+	CC ${DEFINES} ${INCLUDE} -c motif/nsSetupRegistry.cpp
 
 nsActions.o: nsActions.cpp
-	g++ ${DEFINES} ${INCLUDE} -c nsActions.cpp
+	CC ${DEFINES} ${INCLUDE} -c nsActions.cpp
 
 clean:
 	rm -f component.reg components *.o *.so *~ motif/*~ motif/nsSetupRegistry.cpp