diff options
| author | Eli Zaretskii | 2011-01-31 21:36:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-01-31 21:36:08 +0200 |
| commit | 70b0d280eb5cfdf103603fb289064710ae7cd680 (patch) | |
| tree | 39963bbb02985fa36b64cf93dda48e8efbd7823a /ChangeLog | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
| download | emacs-70b0d280eb5cfdf103603fb289064710ae7cd680.tar.gz emacs-70b0d280eb5cfdf103603fb289064710ae7cd680.zip | |
Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu.
lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
$(BLD)/time_r.$(O).
($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
$(EMACS_ROOT)/src/m/intel386.h.
($(BLD)/strftime.$(O)):
($(BLD)/time_r.$(O)): Define prerequisites.
src/makefile.w32-in (OBJ2): Remove strftime.$(O).
($(BLD)/strftime.$(O)): Remove prerequisites.
lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
(ECLIENT_CFLAGS): Remove -DVERSION.
($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
nt/config.nt (VERSION): Uncomment definition.
(restrict): Define.
nt/inc/stdbool.h: New file.
admin/admin.el (set-version): Remove lib-src/makefile.w32-in. Add
nt/config.nt.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
| @@ -1,3 +1,12 @@ | |||
| 1 | 2011-01-31 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and | ||
| 4 | $(BLD)/time_r.$(O). | ||
| 5 | ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and | ||
| 6 | $(EMACS_ROOT)/src/m/intel386.h. | ||
| 7 | ($(BLD)/strftime.$(O)): | ||
| 8 | ($(BLD)/time_r.$(O)): Define prerequisites. | ||
| 9 | |||
| 1 | 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | src/emacs.c now gets version number from configure.in | 12 | src/emacs.c now gets version number from configure.in |