diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-01-31 21:36:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-01-31 21:36:08 +0200 |
| commit | 70b0d280eb5cfdf103603fb289064710ae7cd680 (patch) | |
| tree | 39963bbb02985fa36b64cf93dda48e8efbd7823a /lib/makefile.w32-in | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
| download | emacs-70b0d280eb5cfdf103603fb289064710ae7cd680.tar.gz | |
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 'lib/makefile.w32-in')
| -rw-r--r-- | lib/makefile.w32-in | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index cf74288e2cf..cdf44f614b6 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -23,7 +23,11 @@ ALL = gnulib LOCAL_FLAGS = -DHAVE_CONFIG_H=1 -I. -I../nt/inc -I../src LIBS = -GNULIBOBJS = $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) +GNULIBOBJS = $(BLD)/dtoastr.$(O) \ + $(BLD)/getopt.$(O) \ + $(BLD)/getopt1.$(O) \ + $(BLD)/strftime.$(O) \ + $(BLD)/time_r.$(O) # # Build the library @@ -54,6 +58,8 @@ $(BLD)/dtoastr.$(O) : \ $(SRC)/ftoastr.c \ $(SRC)/ftoastr.h \ $(SRC)/intprops.h \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h $(BLD)/getopt.$(O) : \ @@ -72,10 +78,26 @@ $(BLD)/getopt1.$(O) : \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h +$(BLD)/strftime.$(O) : \ + $(SRC)/strftime.c \ + $(SRC)/strftime.h \ + $(EMACS_ROOT)/nt/inc/stdbool.h \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ + $(EMACS_ROOT)/src/config.h + +$(BLD)/time_r.$(O) : \ + $(SRC)/time_r.c \ + $(EMACS_ROOT)/nt/inc/stdbool.h \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ + $(EMACS_ROOT)/src/config.h + # The following dependencies are for supporting parallel builds, where # we must make sure $(BLD) exists before any compilation starts. # $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD +$(BLD)/strftime.$(O) $(BLD)/time_r.$(O): stamp_BLD # # Headers we would preprocess if we could. |