From 5fd0e79405812793e1f9f1441027a6371535654b Mon Sep 17 00:00:00 2001 From: "mats.palmgren%bredband.net" Date: Wed, 14 Mar 2007 16:44:51 +0000 Subject: [PATCH] Fix --enable-perf-metrics build failure. b=370230 r=jonas sr=benjamin --- layout/build/Makefile.in | 7 ++++--- parser/htmlparser/src/Makefile.in | 2 +- xpfe/components/build/Makefile.in | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 98640cffdb39..1c93c74340c4 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -67,9 +67,6 @@ PACKAGE_VARS += MOZ_XUL ifndef MOZ_ENABLE_LIBXUL EXTRA_DSO_LIBS = gkgfx endif -ifdef MOZ_PERF_METRICS -EXTRA_DSO_LIBS += mozutil_s -endif ifdef MOZ_ENABLE_CAIRO_GFX EXTRA_DSO_LIBS += thebes endif @@ -206,6 +203,10 @@ SHARED_LIBRARY_LIBS += \ $(NULL) endif +ifdef MOZ_PERF_METRICS +SHARED_LIBRARY_LIBS += $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) +endif + ifdef ENABLE_EDITOR_API_LOG DEFINES += -DENABLE_EDITOR_API_LOG endif diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index 3ecfd1dab038..94facbfca1ed 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -74,7 +74,7 @@ SHARED_LIBRARY_LIBS = \ $(NULL) ifdef MOZ_PERF_METRICS -EXTRA_DSO_LIBS += mozutil_s +SHARED_LIBRARY_LIBS += $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) endif CPPSRCS = \ diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index 1799229d4ffe..c6889168c7b6 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -88,7 +88,7 @@ REQUIRES = xpcom \ CPPSRCS = nsModule.cpp ifdef MOZ_PERF_METRICS -EXTRA_DSO_LIBS += mozutil_s +SHARED_LIBRARY_LIBS += $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) endif # General includes