Merge from trunkpending

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index df7f8e274f0..3600406ac13 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -50,7 +50,9 @@ all:		stamp_BLD $(ALL)
 
 ### TAGS ###
 
-TAGS:
+FRC:
+
+TAGS: FRC
          ../lib-src/$(BLD)/etags.exe *.c *.h
 
 ### DEPENDENCIES ###
@@ -153,6 +155,7 @@ $(BLD)/filemode.$(O) : \
 #
 $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
 $(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
+$(BLD)/sha1.$(O) $(BLD)/sha256.$(O) $(BLD)/sha512.$(O): stamp_BLD
 $(BLD)/filemode.$(O): stamp_BLD
 
 #
@@ -210,10 +213,9 @@ getopt_.h-SH: doit
 
 HAVE_GETOPT_H = HAVE_GETOPT_H
 INCLUDE_NEXT = include_next
-PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
 PRAGMA_COLUMNS =
 NEXT_GETOPT_H = <getopt.h>
-ARG_NONNULL_H = ../arg-nonnull.h
+ARG_NONNULL_H = ../build-aux/snippet/arg-nonnull.h
 
 getopt_h:
         - $(DEL) getopt_.h-t getopt_.h