From 6617480bfb78e5fba2e7048a3566007f5f54281a Mon Sep 17 00:00:00 2001 From: "dbaron@dbaron.org" Date: Sun, 19 Aug 2007 18:30:04 -0700 Subject: [PATCH] Link readers against libxul when trace-malloc is part of libxul (fixing tinderbox bustage). --- tools/trace-malloc/Makefile.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index 788b48c3e41..5c9b081fa1c 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -80,7 +80,13 @@ endif include $(topsrcdir)/config/config.mk +ifdef MOZ_ENABLE_LIBXUL +ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +EXTRA_DSO_LIBS = xul +endif +else EXTRA_DSO_LIBS = tracemalloc +endif LIBS += \ $(LIBS_DIR) \ @@ -91,6 +97,12 @@ LIBS += \ $(NSPR_LIBS) \ $(NULL) +ifdef MOZ_ENABLE_LIBXUL +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +LIBS += $(DIST)/bin/XUL +endif +endif + ifdef HAVE_BOUTELL_GD ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += \