diff options
| author | Eli Zaretskii | 2011-02-21 22:00:19 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-02-21 22:00:19 +0200 |
| commit | 25c51af3a920a21ddfc08e6551690c18b679751f (patch) | |
| tree | cfcc9362678ab1ab8dface02dfe1222fe0bfe050 /lib-src | |
| parent | c63090455fe67ba5788aa23a5223655c2cbe9351 (diff) | |
| download | emacs-25c51af3a920a21ddfc08e6551690c18b679751f.tar.gz emacs-25c51af3a920a21ddfc08e6551690c18b679751f.zip | |
Adapt MS-Windows build to import of filemode.c from gnulib.
nt/inc/sys/stat.h (S_ISUID, S_ISGID, S_ISVTX, S_IRGRP, S_IROTH)
(S_IWGRP, S_IWOTH, S_IXGRP, S_IXOTH, S_ISSOCK, S_ISLNK, S_ISCTG)
(S_ISDOOR, S_ISMPB, S_ISMPC, S_ISNWK, S_ISPORT, S_ISWHT)
(S_TYPEISMQ, S_TYPEISSEM, S_TYPEISSHM, S_TYPEISTMO): Define.
(lstat): Define to stat.
lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
src/makefile.w32-in and adapt. Depend on stamp_BLD.
(GNULIBOBJS): Add $(BLD)/filemode.$(O).
src/makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
lib/makefilw.w32-in.
($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h.
(GLOBAL_SOURCES): Remove filemode.c.
(OBJ1): Remove $(BLD)/filemode.$(O).
lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ad8ffa8b754..01352adf4e3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-02-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O)) | ||
| 4 | ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)): | ||
| 5 | Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h. | ||
| 6 | |||
| 1 | 2011-02-21 Ben Key <bkey76@gmail.com> (tiny change) | 7 | 2011-02-21 Ben Key <bkey76@gmail.com> (tiny change) |
| 2 | 8 | ||
| 3 | * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to | 9 | * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 77931c1a36b..bc7b1b27baf 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -374,6 +374,7 @@ $(BLD)/alloca.$(O) : \ | |||
| 374 | $(BLD)/ctags.$(O) : \ | 374 | $(BLD)/ctags.$(O) : \ |
| 375 | $(SRC)/ctags.c \ | 375 | $(SRC)/ctags.c \ |
| 376 | $(EMACS_ROOT)/nt/inc/sys/param.h \ | 376 | $(EMACS_ROOT)/nt/inc/sys/param.h \ |
| 377 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 377 | $(EMACS_ROOT)/src/s/ms-w32.h \ | 378 | $(EMACS_ROOT)/src/s/ms-w32.h \ |
| 378 | $(EMACS_ROOT)/src/m/intel386.h \ | 379 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 379 | $(EMACS_ROOT)/lib-src/../src/config.h \ | 380 | $(EMACS_ROOT)/lib-src/../src/config.h \ |
| @@ -382,6 +383,7 @@ $(BLD)/ctags.$(O) : \ | |||
| 382 | 383 | ||
| 383 | $(BLD)/emacsclient.$(O) : \ | 384 | $(BLD)/emacsclient.$(O) : \ |
| 384 | $(SRC)/emacsclient.c \ | 385 | $(SRC)/emacsclient.c \ |
| 386 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 385 | $(EMACS_ROOT)/src/s/ms-w32.h \ | 387 | $(EMACS_ROOT)/src/s/ms-w32.h \ |
| 386 | $(EMACS_ROOT)/src/m/intel386.h \ | 388 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 387 | $(EMACS_ROOT)/lib-src/../src/config.h | 389 | $(EMACS_ROOT)/lib-src/../src/config.h |
| @@ -389,6 +391,7 @@ $(BLD)/emacsclient.$(O) : \ | |||
| 389 | $(BLD)/etags.$(O) : \ | 391 | $(BLD)/etags.$(O) : \ |
| 390 | $(SRC)/etags.c \ | 392 | $(SRC)/etags.c \ |
| 391 | $(EMACS_ROOT)/nt/inc/sys/param.h \ | 393 | $(EMACS_ROOT)/nt/inc/sys/param.h \ |
| 394 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 392 | $(EMACS_ROOT)/src/s/ms-w32.h \ | 395 | $(EMACS_ROOT)/src/s/ms-w32.h \ |
| 393 | $(EMACS_ROOT)/src/m/intel386.h \ | 396 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 394 | $(EMACS_ROOT)/lib-src/../src/config.h \ | 397 | $(EMACS_ROOT)/lib-src/../src/config.h \ |
| @@ -429,6 +432,7 @@ $(BLD)/movemail.$(O) : \ | |||
| 429 | $(EMACS_ROOT)/src/m/intel386.h \ | 432 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 430 | $(EMACS_ROOT)/lib-src/../src/config.h \ | 433 | $(EMACS_ROOT)/lib-src/../src/config.h \ |
| 431 | $(EMACS_ROOT)/nt/inc/sys/file.h \ | 434 | $(EMACS_ROOT)/nt/inc/sys/file.h \ |
| 435 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 432 | $(EMACS_ROOT)/lib-src/../src/syswait.h \ | 436 | $(EMACS_ROOT)/lib-src/../src/syswait.h \ |
| 433 | $(EMACS_ROOT)/nt/inc/pwd.h \ | 437 | $(EMACS_ROOT)/nt/inc/pwd.h \ |
| 434 | $(SRC)/ntlib.h | 438 | $(SRC)/ntlib.h |
| @@ -437,6 +441,7 @@ $(BLD)/movemail.$(O) : \ | |||
| 437 | $(BLD)/ntlib.$(O) : \ | 441 | $(BLD)/ntlib.$(O) : \ |
| 438 | $(SRC)/ntlib.c \ | 442 | $(SRC)/ntlib.c \ |
| 439 | $(SRC)/ntlib.h \ | 443 | $(SRC)/ntlib.h \ |
| 444 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 440 | $(EMACS_ROOT)/nt/inc/pwd.h | 445 | $(EMACS_ROOT)/nt/inc/pwd.h |
| 441 | 446 | ||
| 442 | $(BLD)/pop.$(O) : \ | 447 | $(BLD)/pop.$(O) : \ |