aboutsummaryrefslogtreecommitdiffstats
path: root/src/makefile.w32-in
diff options
context:
space:
mode:
authorEli Zaretskii2011-01-31 21:36:08 +0200
committerEli Zaretskii2011-01-31 21:36:08 +0200
commit70b0d280eb5cfdf103603fb289064710ae7cd680 (patch)
tree39963bbb02985fa36b64cf93dda48e8efbd7823a /src/makefile.w32-in
parent1dc4075fa8809805aed5092e93e225e889725c94 (diff)
downloademacs-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 'src/makefile.w32-in')
-rw-r--r--src/makefile.w32-in6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ad21419ca7f..4f7bbebf6cb 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -113,7 +113,6 @@ OBJ2 = $(BLD)/sysdep.$(O) \
113 $(BLD)/textprop.$(O) \ 113 $(BLD)/textprop.$(O) \
114 $(BLD)/vm-limit.$(O) \ 114 $(BLD)/vm-limit.$(O) \
115 $(BLD)/region-cache.$(O) \ 115 $(BLD)/region-cache.$(O) \
116 $(BLD)/strftime.$(O) \
117 $(BLD)/bidi.$(O) \ 116 $(BLD)/bidi.$(O) \
118 $(BLD)/charset.$(O) \ 117 $(BLD)/charset.$(O) \
119 $(BLD)/character.$(O) \ 118 $(BLD)/character.$(O) \
@@ -1363,11 +1362,6 @@ $(BLD)/sound.$(O) : \
1363 $(SRC)/systime.h \ 1362 $(SRC)/systime.h \
1364 $(SRC)/w32gui.h 1363 $(SRC)/w32gui.h
1365 1364
1366$(BLD)/strftime.$(O) : \
1367 $(SRC)/strftime.c \
1368 $(CONFIG_H) \
1369 $(EMACS_ROOT)/nt/inc/sys/time.h
1370
1371$(BLD)/syntax.$(O) : \ 1365$(BLD)/syntax.$(O) : \
1372 $(SRC)/syntax.c \ 1366 $(SRC)/syntax.c \
1373 $(CONFIG_H) \ 1367 $(CONFIG_H) \