Makefile.in in johnson-2.0.0.pre1

- old
+ new

@@ -107,10 +107,11 @@
 		xpcwrappednativescope.cpp \
 		XPCNativeWrapper.cpp \
 		xpcJSWeakReference.cpp \
 		XPCSafeJSObjectWrapper.cpp \
 		XPCCrossOriginWrapper.cpp \
+		XPCChromeObjectWrapper.cpp \
 		XPCSystemOnlyWrapper.cpp \
 		XPCWrapper.cpp \
 		xpcquickstubs.cpp \
 		dom_quickstubs.cpp \
 		$(NULL)
@@ -153,17 +154,17 @@
   -DJSFILE \
   -DJS_THREADSAFE \
   -DEXPORT_XPC_API \
   $(NULL)
 
-CONFIG := $(shell cat $(DEPTH)/js/src/mozilla-config.h)
+CONFIG := $(shell cat $(DEPTH)/js/src/js-confdefs.h)
 
 ENABLE_JIT = $(filter JS_TRACER, $(CONFIG))
 
 ifneq (,$(ENABLE_JIT))
 
-# Ugly! We need the AVMPLUS defines out of js/src/mozilla-config.h to make the
+# Ugly! We need the AVMPLUS defines out of js/src/js-confdefs.h to make the
 # nanojit headers happy. Gotta figure out a better way to get them, bug 483677.
 DEFINES += \
   -DJS_TRACER=1 \
   -DFEATURE_NANOJIT=1 \
   $(addprefix -D,$(filter AVMPLUS%,$(CONFIG))) \
@@ -202,14 +203,16 @@
 
 nsXPConnect.$(OBJ_SUFFIX): dom_quickstubs.h
 
 xpcjsruntime.$(OBJ_SUFFIX): dom_quickstubs.h
 
-dom_quickstubs.h dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
-                                     $(srcdir)/qsgen.py \
-                                     $(topsrcdir)/xpcom/idl-parser/header.py \
-                                     $(topsrcdir)/xpcom/idl-parser/xpidl.py \
-                                     $(DEPTH)/js/src/mozilla-config.h
+dom_quickstubs.h: dom_quickstubs.cpp
+
+dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
+                    $(srcdir)/qsgen.py \
+                    $(topsrcdir)/xpcom/idl-parser/header.py \
+                    $(topsrcdir)/xpcom/idl-parser/xpidl.py \
+                    $(DEPTH)/js/src/js-confdefs.h
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/qsgen.py \
 	  --idlpath=$(DEPTH)/dist/idl \