| commit | 70b0d280eb5cfdf103603fb289064710ae7cd680 | |
| author | Eli Zaretskii <eliz@gnu.org> | |
| Mon, 31 Jan 2011 19:36:08 +0000 (31 21:36 +0200) | ||
| committer | Eli Zaretskii <eliz@gnu.org> | |
| Mon, 31 Jan 2011 19:36:08 +0000 (31 21:36 +0200) | ||
| tree | 39963bbb02985fa36b64cf93dda48e8efbd7823a | treesnapshot (tar.gz zip) |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 | commitdiff |
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.
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.