Fix dependencies in the JS shell. bug 388955, patch adapted from one by jorendorff, r=brendan a=NPOTB

js/src/Makefile.ref

@@ -340,10 +340,8 @@ TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \
 	$(OBJDIR)/jscpucfg.o
 endif
 
-#
-# Hardwire dependencies on jsopcode.tbl
-#
-jsopcode.h jsopcode.c: jsopcode.tbl
+# Automatic make dependencies files
+DEPENDENCIES    = $(CFILES:%.c=$(OBJDIR)/%.d)
 
 -include $(DEPENDENCIES)
 

js/src/config.mk

@@ -178,9 +178,6 @@ OBJDIR          = $(OS_CONFIG)$(OBJDIR_TAG).OBJ
 endif
 VPATH           = $(OBJDIR)
 
-# Automatic make dependencies file
-DEPENDENCIES    = $(OBJDIR)/.md
-
 LCJAR = js15lc30.jar
 
 # Library name

js/src/config/Darwin.mk

@@ -45,7 +45,7 @@
 
 CC = cc
 CCC = g++
-CFLAGS +=  -Wall -Wno-format
+CFLAGS +=  -Wall -Wno-format -MMD
 OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
 
 RANLIB = ranlib

js/src/config/Linux_All.mk

@@ -43,7 +43,7 @@
 
 CC = gcc
 CCC = g++
-CFLAGS +=  -Wall -Wno-format
+CFLAGS +=  -Wall -Wno-format -MMD
 OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
 
 RANLIB = echo

js/src/rules.mk

@@ -184,9 +184,6 @@ clobber:
 	rm -rf $(OBJS) $(TARGETS) $(DEPENDENCIES)
 	@cd fdlibm; $(MAKE) -f Makefile.ref clobber
 
-depend:
-	gcc -MM $(CFLAGS) $(LIB_CFILES)
-
 tar:
 	tar cvf $(TARNAME) $(TARFILES)
 	gzip $(TARNAME)