(INTERVAL_SRC): Also depend on dispextern.h.

(coding.o, dispnew.o, keymap.o, msdos.o): Depend on INTERVAL_SRC
instead of intervals.h.

2 files changed, 11 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 804e703eadd..fa4485ad654 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (INTERVAL_SRC): Also depend on dispextern.h.
+        (coding.o, dispnew.o, keymap.o, msdos.o): Depend on INTERVAL_SRC
+        instead of intervals.h.
+
 2008-12-26  Andreas Schwab  <schwab@suse.de>
 
         * keymap.c (map_keymap_char_table_item): Make a copy of KEY if it is a
diff --git a/src/Makefile.in b/src/Makefile.in
index e3af6e5feef..c7abc4938ba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -499,7 +499,7 @@ TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_S
 #define UNEXEC unexec.o
 #endif
 
-INTERVAL_SRC = intervals.h composite.h
+INTERVAL_SRC = dispextern.h intervals.h composite.h
 
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 
@@ -1044,7 +1044,7 @@ character.o: character.c character.h buffer.h charset.h composite.h disptab.h \
 charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \
    disptab.h $(config_h)
 chartab.o: charset.h character.h $(config_h)
-coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h intervals.h composite.h \
+coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h $(INTERVAL_SRC) composite.h \
         window.h dispextern.h frame.h termhooks.h $(config_h)
 cm.o: cm.c frame.h cm.h termhooks.h termchar.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h $(config_h) \
@@ -1057,7 +1057,7 @@ dired.o: dired.c commands.h buffer.h $(config_h) character.h charset.h \
    coding.h regex.h systime.h blockinput.h atimer.h
 dispnew.o: dispnew.c systime.h commands.h process.h frame.h \
    window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \
-   disptab.h indent.h intervals.h \
+   disptab.h indent.h $(INTERVAL_SRC) \
    xterm.h blockinput.h atimer.h character.h msdos.h composite.h keyboard.h \
    syssignal.h $(config_h)
 doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h character.h
@@ -1104,7 +1104,7 @@ keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
    xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h \
    $(config_h)
 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
-   atimer.h systime.h puresize.h character.h charset.h intervals.h keymap.h window.h \
+   atimer.h systime.h puresize.h character.h charset.h $(INTERVAL_SRC) keymap.h window.h \
    $(config_h)
 lastfile.o: lastfile.c  $(config_h)
 macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h \
@@ -1121,7 +1121,7 @@ minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
 mktime.o: mktime.c $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
-   keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.h $(config_h)
+   keyboard.h $(INTERVAL_SRC) buffer.h commands.h blockinput.h atimer.h $(config_h)
 nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \
   dispextern.h nsgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
   atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h)