diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-07-11 09:39:00 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-07-11 09:39:00 +0300 |
| commit | 994a7c3beb2fb2fe9f98426529fd45f3d47391d6 (patch) | |
| tree | 57da93a181e408f7d12ac56b1ca17168bb204a15 /lib-src | |
| parent | 462aa963ef0f9d209b611fca59fa697486f5f833 (diff) | |
| download | emacs-994a7c3beb2fb2fe9f98426529fd45f3d47391d6.tar.gz | |
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 @@ +2010-07-11 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o, + and unexw32.o. (Bug#6603) + 2010-07-10 Eli Zaretskii <eliz@gnu.org> * 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 # obj = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ - fontset.o \ + fontset.o menu.o \ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ - font.o w32font.o \ - dispnew.o frame.o scroll.o xdisp.o window.o \ + font.o w32font.o w32uniscribe.o \ + dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \ charset.o coding.o category.o ccl.o character.o chartab.o \ cm.o term.o terminal.o xfaces.o \ emacs.o keyboard.o macros.o keymap.o sysdep.o \ @@ -157,7 +157,7 @@ obj = dosfns.o msdos.o \ alloc.o data.o doc.o editfns.o callint.o \ eval.o floatfns.o fns.o print.o lread.o \ syntax.o bytecode.o \ - process.o callproc.o \ + process.o callproc.o unexw32.o \ region-cache.o sound.o atimer.o \ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o |