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 | |
| 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')
| -rw-r--r-- | lib/makefile.w32-in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 02953c9863a..f1071c9dbfd 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in | |||
| @@ -28,7 +28,8 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \ | |||
| 28 | $(BLD)/getopt1.$(O) \ | 28 | $(BLD)/getopt1.$(O) \ |
| 29 | $(BLD)/strftime.$(O) \ | 29 | $(BLD)/strftime.$(O) \ |
| 30 | $(BLD)/time_r.$(O) \ | 30 | $(BLD)/time_r.$(O) \ |
| 31 | $(BLD)/md5.$(O) | 31 | $(BLD)/md5.$(O) \ |
| 32 | $(BLD)/filemode.$(O) | ||
| 32 | 33 | ||
| 33 | # | 34 | # |
| 34 | # Build the library | 35 | # Build the library |
| @@ -95,17 +96,26 @@ $(BLD)/time_r.$(O) : \ | |||
| 95 | $(EMACS_ROOT)/src/config.h | 96 | $(EMACS_ROOT)/src/config.h |
| 96 | 97 | ||
| 97 | $(BLD)/md5.$(O) : \ | 98 | $(BLD)/md5.$(O) : \ |
| 98 | $(EMACS_ROOT)/lib/md5.c \ | 99 | $(SRC)/md5.c \ |
| 100 | $(SRC)/md5.h \ | ||
| 99 | $(EMACS_ROOT)/src/s/ms-w32.h \ | 101 | $(EMACS_ROOT)/src/s/ms-w32.h \ |
| 100 | $(EMACS_ROOT)/src/m/intel386.h \ | 102 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 101 | $(EMACS_ROOT)/src/config.h \ | 103 | $(EMACS_ROOT)/src/config.h |
| 102 | $(EMACS_ROOT)/lib/md5.h | 104 | |
| 105 | $(BLD)/filemode.$(O) : \ | ||
| 106 | $(SRC)/filemode.c \ | ||
| 107 | $(SRC)/filemode.h \ | ||
| 108 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 109 | $(EMACS_ROOT)/src/s/ms-w32.h \ | ||
| 110 | $(EMACS_ROOT)/src/m/intel386.h \ | ||
| 111 | $(EMACS_ROOT)/src/config.h | ||
| 103 | 112 | ||
| 104 | # The following dependencies are for supporting parallel builds, where | 113 | # The following dependencies are for supporting parallel builds, where |
| 105 | # we must make sure $(BLD) exists before any compilation starts. | 114 | # we must make sure $(BLD) exists before any compilation starts. |
| 106 | # | 115 | # |
| 107 | $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD | 116 | $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD |
| 108 | $(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD | 117 | $(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD |
| 118 | $(BLD)/filemode.$(O): stamp_BLD | ||
| 109 | 119 | ||
| 110 | # | 120 | # |
| 111 | # Headers we would preprocess if we could. | 121 | # Headers we would preprocess if we could. |