Merging cedar with mozilla-central.

tools/jprof/README.html

@@ -36,13 +36,7 @@ its time.
 
 <h3><a name="setup">Setup</a></h3>
 
-First, check out the jprof source code since it is not a part of the
-default pull.  To do this do:
-<pre>
-  cvs co mozilla/tools/jprof
-</pre>
-
-<p>Next, configure your mozilla with jprof support by adding
+<p>Configure your mozilla with jprof support by adding
 <code>--enable-jprof</code> to your configure options (eg adding
 <code>ac_add_options --enable-jprof</code> to your <code>.mozconfig</code>) and
 making sure that you do <strong>not</strong> have the

tools/jprof/stub/Makefile.in

@@ -47,6 +47,7 @@ MODULE		= jprof
 EXPORTS		=
 LIBRARY_NAME	= jprof
 EXPORT_LIBRARY	= 1
+FORCE_SHARED_LIB = 1
 
 # override optimization
 MOZ_OPTIMIZE_FLAGS = -fno-omit-frame-pointer