Merge from trunk.

[bpt/emacs.git] / lib / makefile.w32-in

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index c60d85a..df7f8e2 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -28,7 +28,11 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \
             $(BLD)/getopt1.$(O) \
             $(BLD)/strftime.$(O) \
             $(BLD)/time_r.$(O) \
-            $(BLD)/md5.$(O)
+            $(BLD)/md5.$(O) \
+            $(BLD)/sha1.$(O) \
+            $(BLD)/sha256.$(O) \
+            $(BLD)/sha512.$(O) \
+            $(BLD)/filemode.$(O)
 
 #
 # Build the library
@@ -59,6 +63,7 @@ $(BLD)/dtoastr.$(O) : \
        $(SRC)/ftoastr.c \
        $(SRC)/ftoastr.h \
        $(SRC)/intprops.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
@@ -67,6 +72,9 @@ $(BLD)/getopt.$(O) : \
        $(SRC)/getopt.c \
        $(SRC)/getopt.h \
        $(SRC)/getopt_int.h \
+       $(SRC)/gettext.h \
+       $(EMACS_ROOT)/nt/inc/unistd.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
@@ -75,6 +83,7 @@ $(BLD)/getopt1.$(O) : \
        $(SRC)/getopt1.c \
        $(SRC)/getopt.h \
        $(SRC)/getopt_int.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
@@ -83,30 +92,68 @@ $(BLD)/strftime.$(O) : \
        $(SRC)/strftime.c \
        $(SRC)/strftime.h \
        $(EMACS_ROOT)/nt/inc/stdbool.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
 
 $(BLD)/time_r.$(O) : \
        $(SRC)/time_r.c \
-       $(EMACS_ROOT)/nt/inc/stdbool.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
 
 $(BLD)/md5.$(O) : \
-       $(EMACS_ROOT)/lib/md5.c \
+       $(SRC)/md5.c \
+       $(SRC)/md5.h \
+       $(EMACS_ROOT)/nt/inc/stdint.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 \
+       $(EMACS_ROOT)/src/config.h
+
+$(BLD)/sha1.$(O) : \
+       $(SRC)/sha1.c \
+       $(SRC)/sha1.h \
+       $(EMACS_ROOT)/nt/inc/stdint.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
+
+$(BLD)/sha256.$(O) : \
+       $(SRC)/sha256.c \
+       $(SRC)/sha256.h \
+       $(EMACS_ROOT)/nt/inc/stdint.h \
        $(EMACS_ROOT)/nt/inc/sys/stat.h \
-       $(EMACS_ROOT)/lib/md5.h
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h
+
+$(BLD)/sha512.$(O) : \
+       $(SRC)/sha512.c \
+       $(SRC)/sha512.h \
+       $(EMACS_ROOT)/nt/inc/stdint.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
+
+$(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.
@@ -170,7 +217,8 @@ ARG_NONNULL_H = ../arg-nonnull.h
 
 getopt_h:
        - $(DEL) getopt_.h-t getopt_.h
-       sed -e "s!@HAVE_GETOPT_H@!$(HAVE_GETOPT_H)!g" \
+       sed -e "s!@GUARD_PREFIX@!GL!g" \
+           -e "s!@HAVE_GETOPT_H@!$(HAVE_GETOPT_H)!g" \
            -e "s!@INCLUDE_NEXT@!$(INCLUDE_NEXT)!g" \
            -e "s!@PRAGMA_SYSTEM_HEADER@!$(PRAGMA_SYSTEM_HEADER)!g" \
            -e "s!@PRAGMA_COLUMNS@!$(PRAGMA_COLUMNS)!g" \