diff options
| author | Eli Zaretskii | 2010-07-11 09:39:00 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-07-11 09:39:00 +0300 |
| commit | 994a7c3beb2fb2fe9f98426529fd45f3d47391d6 (patch) | |
| tree | 57da93a181e408f7d12ac56b1ca17168bb204a15 /lib-src | |
| parent | 462aa963ef0f9d209b611fca59fa697486f5f833 (diff) | |
| download | emacs-994a7c3beb2fb2fe9f98426529fd45f3d47391d6.tar.gz emacs-994a7c3beb2fb2fe9f98426529fd45f3d47391d6.zip | |
Fix bug #6603.
makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o, and unexw32.o.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index fd7c89807d2..125e0df4817 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-07-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o, | ||
| 4 | and unexw32.o. (Bug#6603) | ||
| 5 | |||
| 1 | 2010-07-10 Eli Zaretskii <eliz@gnu.org> | 6 | 2010-07-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in ($(DESTDIR)${archlibdir}): Convert spaces to TABs. | 8 | * Makefile.in ($(DESTDIR)${archlibdir}): Convert spaces to TABs. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index cad3b838208..fbcab0183ce 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -143,11 +143,11 @@ $(BLD)/ctags.$(O): ctags.c | |||
| 143 | # | 143 | # |
| 144 | obj = dosfns.o msdos.o \ | 144 | obj = dosfns.o msdos.o \ |
| 145 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 145 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
| 146 | fontset.o \ | 146 | fontset.o menu.o \ |
| 147 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ | 147 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ |
| 148 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ | 148 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ |
| 149 | font.o w32font.o \ | 149 | font.o w32font.o w32uniscribe.o \ |
| 150 | dispnew.o frame.o scroll.o xdisp.o window.o \ | 150 | dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \ |
| 151 | charset.o coding.o category.o ccl.o character.o chartab.o \ | 151 | charset.o coding.o category.o ccl.o character.o chartab.o \ |
| 152 | cm.o term.o terminal.o xfaces.o \ | 152 | cm.o term.o terminal.o xfaces.o \ |
| 153 | emacs.o keyboard.o macros.o keymap.o sysdep.o \ | 153 | emacs.o keyboard.o macros.o keymap.o sysdep.o \ |
| @@ -157,7 +157,7 @@ obj = dosfns.o msdos.o \ | |||
| 157 | alloc.o data.o doc.o editfns.o callint.o \ | 157 | alloc.o data.o doc.o editfns.o callint.o \ |
| 158 | eval.o floatfns.o fns.o print.o lread.o \ | 158 | eval.o floatfns.o fns.o print.o lread.o \ |
| 159 | syntax.o bytecode.o \ | 159 | syntax.o bytecode.o \ |
| 160 | process.o callproc.o \ | 160 | process.o callproc.o unexw32.o \ |
| 161 | region-cache.o sound.o atimer.o \ | 161 | region-cache.o sound.o atimer.o \ |
| 162 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o | 162 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o |
| 163 | 163 | ||