aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-10-12 01:23:15 +0000
committerDan Nicolaescu2007-10-12 01:23:15 +0000
commit47632e43ca42e26da139289f1e0f4f69e8c140fd (patch)
treef53eb8173b25a244dfc6fd5846f1bd4f5750ced0
parentaa603a2acc70f6b044783a6d6dc018647ab7db4f (diff)
downloademacs-47632e43ca42e26da139289f1e0f4f69e8c140fd.tar.gz
emacs-47632e43ca42e26da139289f1e0f4f69e8c140fd.zip
* Makefile.in (fringe.o, minibuf.o): Fix dependencies.
-rw-r--r--src/ChangeLog.unicode4
-rw-r--r--src/Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 61b3e8cd76d..b3f20c24a55 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,7 @@
12007-10-12 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * Makefile.in (fringe.o, minibuf.o): Fix dependencies.
4
12007-10-11 Miles Bader <miles@gnu.org> 52007-10-11 Miles Bader <miles@gnu.org>
2 6
3 * xdisp.c (get_char_face_and_encoding): Remove extraneous definition. 7 * xdisp.c (get_char_face_and_encoding): Remove extraneous definition.
diff --git a/src/Makefile.in b/src/Makefile.in
index f968fcf4599..c73f402f228 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1156,7 +1156,7 @@ filemode.o: filemode.c $(config_h)
1156frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ 1156frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
1157 blockinput.h atimer.h systime.h buffer.h character.h fontset.h \ 1157 blockinput.h atimer.h systime.h buffer.h character.h fontset.h \
1158 msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h) 1158 msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h)
1159fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhook.h $(config_h) 1159fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h)
1160font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ 1160font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
1161 font.h $(config_h) 1161 font.h $(config_h)
1162ftfont.o: dispextern.h frame.h character.h charset.h font.h $(config_h) 1162ftfont.o: dispextern.h frame.h character.h charset.h font.h $(config_h)
@@ -1188,7 +1188,7 @@ marker.o: marker.c buffer.h character.h $(config_h)
1188md5.o: md5.c md5.h $(config_h) 1188md5.o: md5.c md5.h $(config_h)
1189minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \ 1189minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
1190 buffer.h commands.h character.h msdos.h $(INTERVAL_SRC) keymap.h \ 1190 buffer.h commands.h character.h msdos.h $(INTERVAL_SRC) keymap.h \
1191 terhooks.h $(config_h) 1191 termhooks.h $(config_h)
1192mktime.o: mktime.c $(config_h) 1192mktime.o: mktime.c $(config_h)
1193msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ 1193msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
1194 termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \ 1194 termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \