Merge from trunk.

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

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 99eda06..df7f8e2 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -30,6 +30,8 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \
             $(BLD)/time_r.$(O) \
             $(BLD)/md5.$(O) \
             $(BLD)/sha1.$(O) \
+            $(BLD)/sha256.$(O) \
+            $(BLD)/sha512.$(O) \
             $(BLD)/filemode.$(O)
 
 #
@@ -120,6 +122,24 @@ $(BLD)/sha1.$(O) : \
        $(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)/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 \
@@ -197,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" \