summaryrefslogtreecommitdiff
path: root/lib/makefile.w32-in
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2011-02-21 22:00:19 +0200
committerEli Zaretskii <eliz@gnu.org>2011-02-21 22:00:19 +0200
commit25c51af3a920a21ddfc08e6551690c18b679751f (patch)
treecfcc9362678ab1ab8dface02dfe1222fe0bfe050 /lib/makefile.w32-in
parentc63090455fe67ba5788aa23a5223655c2cbe9351 (diff)
downloademacs-25c51af3a920a21ddfc08e6551690c18b679751f.tar.gz
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/makefile.w32-in')
-rw-r--r--lib/makefile.w32-in18
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) \
$(BLD)/getopt1.$(O) \
$(BLD)/strftime.$(O) \
$(BLD)/time_r.$(O) \
- $(BLD)/md5.$(O)
+ $(BLD)/md5.$(O) \
+ $(BLD)/filemode.$(O)
#
# Build the library
@@ -95,17 +96,26 @@ $(BLD)/time_r.$(O) : \
$(EMACS_ROOT)/src/config.h
$(BLD)/md5.$(O) : \
- $(EMACS_ROOT)/lib/md5.c \
+ $(SRC)/md5.c \
+ $(SRC)/md5.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/m/intel386.h \
- $(EMACS_ROOT)/src/config.h \
- $(EMACS_ROOT)/lib/md5.h
+ $(EMACS_ROOT)/src/config.h
+
+$(BLD)/filemode.$(O) : \
+ $(SRC)/filemode.c \
+ $(SRC)/filemode.h \
+ $(EMACS_ROOT)/nt/inc/sys/stat.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) $(BLD)/md5.$(O): stamp_BLD
+$(BLD)/filemode.$(O): stamp_BLD
#
# Headers we would preprocess if we could.