b=406626 Make metrics extension build --with-libxul-sdk=/path/to/sdk --enable-application=extensions/metrics r=ted.mielczarek --pete
authorpete@mozdevgroup.com
Wed, 12 Dec 2007 08:58:45 -0800
changeset 8961 7a7cc68f1fccdb68699432de4e5c0bdad01d562d
parent 8960 6453c36820392c18acdaed0a933a92ada1a4dc46
child 8962 3eb11245684c7f412e17b1e9b84aa4f30ff214eb
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs406626
milestone1.9b3pre
b=406626 Make metrics extension build --with-libxul-sdk=/path/to/sdk --enable-application=extensions/metrics r=ted.mielczarek --pete
extensions/metrics/Makefile.in
extensions/metrics/src/Makefile.in
--- a/extensions/metrics/Makefile.in
+++ b/extensions/metrics/Makefile.in
@@ -37,33 +37,34 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+METRICS_VERSION = 2a1
 XPI_NAME		= metrics
 USE_EXTENSION_MANIFEST	= 1
 NO_JAR_AUTO_REG		= 1
 INSTALL_EXTENSION_ID	= metrics@mozilla.org
-XPI_PKGNAME		= metrics-$(MOZ_APP_VERSION)
+XPI_PKGNAME		= metrics-$(METRICS_VERSION)
 
 DIRS		= public src build
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 PREF_JS_EXPORTS = $(srcdir)/metrics.js
 
 DIST_FILES = install.rdf
 
 # We should really pull FIREFOX_VERSION from browser/config/version.txt but we
 # can't be assured that we've even pulled those files. So we hardcode them.
 
 XULAPP_DEFINES = \
         -DFIREFOX_VERSION=$(FIREFOX_VERSION) \
-        -DEXTENSION_VERSION=$(MOZILLA_VERSION) \
+        -DEXTENSION_VERSION=$(METRICS_VERSION) \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/metrics/src/Makefile.in
+++ b/extensions/metrics/src/Makefile.in
@@ -59,33 +59,20 @@ REQUIRES	= xpcom \
 		  widget \
 		  libbz2 \
 		  xulapp \
 		  extensions \
 		  rdf \
 		  plugin \
 		  content \
 		  autocomplete \
+		  places \
+		  toolkitcomps \
 		  $(NULL)
 
-# nsIScreenManager has moved to widget on the trunk
-# nsIDOMParser and nsIDOMSerializer have moved to content.
-ifdef MOZILLA_1_8_BRANCH
-REQUIRES	+= gfx xmlextras
-else
-REQUIRES	+= widget
-endif
-
-ifdef MOZ_PLACES
-REQUIRES	+= places toolkitcomps
-endif
-ifndef MOZ_PLACES_BOOKMARKS
-REQUIRES	+= bookmarks
-endif
-
 CSRCS		= \
 		md5.c \
 		nssstubs.c \
 		$(NULL)
 
 CPPSRCS		= \
 		nsLoadCollector.cpp \
 		nsMetricsConfig.cpp \
@@ -97,17 +84,17 @@ CPPSRCS		= \
 		nsAutoCompleteCollector.cpp \
 		nsStringUtils.cpp \
 		$(NULL)
 
 # Create a static library to link into the component library and unit tests
 FORCE_STATIC_LIB = 1
 
 # md5.c requires NSS headers
-LOCAL_INCLUDES = -I$(DIST)/public/nss -I$(DIST)/private/nss
+LOCAL_INCLUDES = -I$(topsrcdir)/security/nss/lib/freebl
 
 # Link against the static CRT
 ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 USE_STATIC_LIBS = 1
 EXTRA_DSO_LDOPTS += -NODEFAULTLIB:MSVCRT \
 		    -NODEFAULTLIB:MSVCRTD \
 		    $(NULL)
 endif