From: Kenichi Handa <handa@m17n.org>
Date: Tue, 20 May 2008 06:44:03 +0000 (+0000)
Subject: (obj): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~5413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1285557220b19dccf382eb9f84f2b8fa6278d2e5;p=emacs.git

(obj): Fix previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 38c3cd4d318..14bad696e3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,7 +3,7 @@
 	* Makefile.in (FONTSRC): Delete it.  Change all $(FONTSRC) to
 	font.h through out the file.
 	(FONT_DRIVERS): Renamed from FONTOBJ.
-	(obj): Delete $(FONTOBJ).  Add font.o.
+	(obj): Change $(FONTOBJ) to $(FONT_DRIVERS).  Add font.o.
 	(SOME_MACHINE_OBJECTS): Change $(FONTOBJ) to $(FONT_DRIVERS).
 
 	* emacs.c (main): Call syms_of_font unconditionally.
diff --git a/src/Makefile.in b/src/Makefile.in
index 6008c93721c..4f9ccb81e7e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -564,7 +564,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
 	process.o callproc.o \
 	region-cache.o sound.o atimer.o \
 	doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
-	$(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ)
+	$(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
 
 /* Object files used on some machine or other.
    These go in the DOC file on all machines