Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com

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

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index df7f8e2..8c27f13 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -41,16 +41,18 @@ $(BLD)/libgnu.$(A): $(GNULIBOBJS)
        - $(DEL) $@
        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 
-gnulib:        stamp_BLD $(BLD)/libgnu.$(A)
+gnulib:                $(BLD)/libgnu.$(A)
 
 #
 # Build everything
 #
-all:           stamp_BLD $(ALL)
+all:           $(ALL)
 
 ### TAGS ###
 
-TAGS:
+FRC:
+
+TAGS: FRC
         ../lib-src/$(BLD)/etags.exe *.c *.h
 
 ### DEPENDENCIES ###
@@ -65,7 +67,6 @@ $(BLD)/dtoastr.$(O) : \
        $(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
 
 $(BLD)/getopt.$(O) : \
@@ -76,7 +77,6 @@ $(BLD)/getopt.$(O) : \
        $(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
 
 $(BLD)/getopt1.$(O) : \
@@ -85,7 +85,6 @@ $(BLD)/getopt1.$(O) : \
        $(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
 
 $(BLD)/strftime.$(O) : \
@@ -94,14 +93,12 @@ $(BLD)/strftime.$(O) : \
        $(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/sys/stat.h \
        $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h
 
 $(BLD)/md5.$(O) : \
@@ -110,7 +107,6 @@ $(BLD)/md5.$(O) : \
        $(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)/sha1.$(O) : \
@@ -119,7 +115,6 @@ $(BLD)/sha1.$(O) : \
        $(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) : \
@@ -128,7 +123,6 @@ $(BLD)/sha256.$(O) : \
        $(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) : \
@@ -137,7 +131,6 @@ $(BLD)/sha512.$(O) : \
        $(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) : \
@@ -145,7 +138,6 @@ $(BLD)/filemode.$(O) : \
        $(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
@@ -153,6 +145,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 +203,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