diff options
| author | Kenichi Handa | 2008-05-20 06:44:03 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-05-20 06:44:03 +0000 |
| commit | 1285557220b19dccf382eb9f84f2b8fa6278d2e5 (patch) | |
| tree | 510bfab7cec46ba2da8c1fbb96b04a9dcd3d57b6 /src | |
| parent | ad00e1a3bfe533351f11195e6095b643bae96984 (diff) | |
| download | emacs-1285557220b19dccf382eb9f84f2b8fa6278d2e5.tar.gz emacs-1285557220b19dccf382eb9f84f2b8fa6278d2e5.zip | |
(obj): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 38c3cd4d318..14bad696e3b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Makefile.in (FONTSRC): Delete it. Change all $(FONTSRC) to | 3 | * Makefile.in (FONTSRC): Delete it. Change all $(FONTSRC) to |
| 4 | font.h through out the file. | 4 | font.h through out the file. |
| 5 | (FONT_DRIVERS): Renamed from FONTOBJ. | 5 | (FONT_DRIVERS): Renamed from FONTOBJ. |
| 6 | (obj): Delete $(FONTOBJ). Add font.o. | 6 | (obj): Change $(FONTOBJ) to $(FONT_DRIVERS). Add font.o. |
| 7 | (SOME_MACHINE_OBJECTS): Change $(FONTOBJ) to $(FONT_DRIVERS). | 7 | (SOME_MACHINE_OBJECTS): Change $(FONTOBJ) to $(FONT_DRIVERS). |
| 8 | 8 | ||
| 9 | * emacs.c (main): Call syms_of_font unconditionally. | 9 | * 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 \ | |||
| 564 | process.o callproc.o \ | 564 | process.o callproc.o \ |
| 565 | region-cache.o sound.o atimer.o \ | 565 | region-cache.o sound.o atimer.o \ |
| 566 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ | 566 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ |
| 567 | $(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ) | 567 | $(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) |
| 568 | 568 | ||
| 569 | /* Object files used on some machine or other. | 569 | /* Object files used on some machine or other. |
| 570 | These go in the DOC file on all machines | 570 | These go in the DOC file on all machines |