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.

2 files changed, 10 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d95ebb32dee..9713a4a6ed5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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).
+
 2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Import filemode module from gnulib.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ca7fdcac029..7a702fd45bf 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -72,7 +72,6 @@ OBJ1 =  $(BLD)/alloc.$(O)		\
         $(BLD)/eval.$(O)                \
         $(BLD)/fileio.$(O)              \
         $(BLD)/filelock.$(O)            \
-        $(BLD)/filemode.$(O)            \
         $(BLD)/fns.$(O)                 \
         $(BLD)/indent.$(O)              \
         $(BLD)/insdel.$(O)              \
@@ -213,7 +212,7 @@ GLOBAL_SOURCES =   dosfns.c msdos.c \
         cm.c term.c terminal.c xfaces.c \
         emacs.c keyboard.c macros.c keymap.c sysdep.c \
         buffer.c filelock.c insdel.c marker.c \
-        minibuf.c fileio.c dired.c filemode.c \
+        minibuf.c fileio.c dired.c \
         cmds.c casetab.c casefiddle.c indent.c search.c regex.c undo.c \
         alloc.c data.c doc.c editfns.c callint.c \
         eval.c floatfns.c fns.c print.c lread.c \
@@ -663,6 +662,7 @@ $(BLD)/dired.$(O) : \
         $(SRC)/coding.h \
         $(SRC)/commands.h \
         $(SRC)/composite.h \
+        $(EMACS_ROOT)/lib/filemode.h \
         $(SRC)/ndir.h \
         $(SRC)/regex.h \
         $(SRC)/systime.h
@@ -821,10 +821,6 @@ $(BLD)/filelock.$(O) : \
         $(SRC)/composite.h \
         $(SRC)/systime.h
 
-$(BLD)/filemode.$(O) : \
-        $(SRC)/filemode.c \
-        $(CONFIG_H)
-
 $(BLD)/firstfile.$(O) : \
         $(SRC)/firstfile.c \
         $(CONFIG_H)