Merge commit, no conflicts
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 30 May 2008 08:49:57 -0400
changeset 15150 c3fab88ef4f7e349b3fab748f2438834825df07e
parent 15149 d87f575aac597d1ea52bb7b9449df26a5a3a4fee (current diff)
parent 15148 b48cd29edac89d7b3d613df2b963fc70f1df7c53 (diff)
child 15201 a61611c9992a4f57427da96bdc668713ae236ea1
push idunknown
push userunknown
push dateunknown
milestone1.9.1a1pre
Merge commit, no conflicts
--- a/js/src/Makefile.ref
+++ b/js/src/Makefile.ref
@@ -338,17 +338,17 @@ ifndef PREBUILT_CPUCFG
 	$(CXX) -o $@ $(OBJDIR)/jscpucfg.o
 
 # Add to TARGETS for clobber rule
 TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \
 	$(OBJDIR)/jscpucfg.o
 endif
 
 # Automatic make dependencies files
-DEPENDENCIES    = $(CFILES:%.c=$(OBJDIR)/%.d)
+DEPENDENCIES    = $(CPPFILES:%.cpp=$(OBJDIR)/%.d)
 
 #
 # Hardwire dependencies for jsinvoke.c
 #
 ifdef USE_MSVC
 $(OBJDIR)/jsinvoke.obj : jsinterp.h jsinterp.cpp
 else
 $(OBJDIR)/jsinvoke.o : jsinterp.h jsinterp.cpp