Bug 87215. Make jprof work right with the static build. r=cls, sr=leaf

allmakefiles.sh

@@ -963,7 +963,8 @@ fi
 
 # tools/jprof
 if [ "$MOZ_JPROF" ]; then
-    MAKEFILES_jprof="tools/jprof/Makefile"
+    MAKEFILES_jprof="tools/jprof/Makefile
+        tools/jprof/stub/Makefile"
 fi
 
 # tools/leaky

tools/jprof/Makefile.in

@@ -20,6 +20,7 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+DIRS		= stub
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -39,52 +40,14 @@ LIBS = \
 	-liberty \
 	$(NULL)
 
-# Stuff to build the library used to wrap malloc
-LIBMALLOC_CPPSRCS = libmalloc.cpp
-LIBMALLOC_OBJECTS = $(LIBMALLOC_CPPSRCS:.cpp=.o)
-LIBMALLOC = libjprof.so
-
-EXPORTS         = \
-                jprof.h \
-                $(NULL)
-
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
-
-# include $(topsrcdir)/config/config.mk
-
-OTHER_LIBRARIES = $(LIBMALLOC)
-HELPER_SCRIPTS = jprofsig
-HELPER_SCRIPTS  := $(addprefix $(srcdir)/, $(HELPER_SCRIPTS))
-TARGETS := $(PROGRAM) $(OTHER_LIBRARIES)
+HELPER_SCRIPTS	= jprofsig
+HELPER_SCRIPTS	:= $(addprefix $(srcdir)/, $(HELPER_SCRIPTS))
 
 include $(topsrcdir)/config/rules.mk
 
-# Make sure all depends on files that rules.mk doesn't know about.
-all:: $(OTHER_LIBRARIES)
-
-# Make sure install depends on files that rules.mk doesn't know about.
-install:: $(OTHER_LIBRARIES) $(HELPER_SCRIPTS)
-
-# Make sure libs depends on files that rules.mk doesn't know about.
-libs:: $(OTHER_LIBRARIES)
-
-clobber::
-	rm -f $(LIBMALLOC_OBJECTS)
-	rm -f $(LIBMALLOC)
-
-clean::
-	rm -f $(LIBMALLOC_OBJECTS)
-
-$(LIBMALLOC): $(LIBMALLOC_OBJECTS)
-	rm -f $@
-	$(MKSHLIB) -o $@ $(LIBMALLOC_OBJECTS)
-
-test:
-	@echo LIBMALLOC = $(LIBMALLOC)
-	@echo TARGETS = $(TARGETS)
+INCLUDES += \
+	-I$(srcdir)/stub \
+	$(NULL)
 
 install::
-	$(INSTALL) -m 555 $(OTHER_LIBRARIES) $(DIST)/lib
-	$(INSTALL) -m 555 $(OTHER_LIBRARIES) $(DIST)/bin
 	$(INSTALL) -m 555 $(HELPER_SCRIPTS)  $(DIST)/bin

tools/jprof/stub/.cvsignore

@@ -0,0 +1 @@
+Makefile

tools/jprof/stub/Makefile.in

@@ -0,0 +1,42 @@
+#! gmake
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License
+# at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and
+# limitations under the License.
+#
+# The Initial Developer of the Original Code is Kipp E.B. Hickman.
+#
+# Autoconf version of original Makefile
+# Fri Sep 24 23:44:10 PDT 1999 <mcafee@netscape.com>
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= jprof
+EXPORTS		=
+LIBRARY_NAME	= jprof
+EXPORT_LIBRARY	= 1
+
+CPPSRCS		= \
+		libmalloc.cpp \
+		$(NULL)
+
+EXPORTS         = \
+                jprof.h \
+                $(NULL)
+
+EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
+
+
+include $(topsrcdir)/config/rules.mk