b=406626 Make metrics extension build --with-libxul-sdk=/path/to/sdk --enable-application=extensions/metrics r=ted.mielczarek --pete

extensions/metrics/Makefile.in

@@ -42,11 +42,12 @@ 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
 
@@ -63,7 +64,7 @@ DIST_FILES = install.rdf
 
 XULAPP_DEFINES = \
         -DFIREFOX_VERSION=$(FIREFOX_VERSION) \
-        -DEXTENSION_VERSION=$(MOZILLA_VERSION) \
+        -DEXTENSION_VERSION=$(METRICS_VERSION) \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk

extensions/metrics/src/Makefile.in

@@ -64,23 +64,10 @@ REQUIRES	= xpcom \
 		  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 \
@@ -102,7 +89,7 @@ CPPSRCS		= \
 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_)