Merge from trunk

[gnu-emacs] / lib / makefile.w32-in

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index cf74288e2cfd7d2c880ef241b78af121bbd1d09b..289f6bffdb90022c37debcd9997eb5f5d2c545e9 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -23,7 +23,13 @@ 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) \
+            $(BLD)/md5.$(O) \
+            $(BLD)/filemode.$(O)
 
 #
 # Build the library
@@ -54,6 +60,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 +80,43 @@ $(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
+
+$(BLD)/md5.$(O) : \
+       $(SRC)/md5.c \
+       $(SRC)/md5.h \
+       $(EMACS_ROOT)/nt/inc/stdint.h \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.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.