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 cf74288..8c27f13 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -23,7 +23,16 @@ 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)/sha1.$(O) \
+            $(BLD)/sha256.$(O) \
+            $(BLD)/sha512.$(O) \
+            $(BLD)/filemode.$(O)
 
 #
 # Build the library
@@ -32,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 ###
@@ -54,28 +65,88 @@ $(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/config.h
 
 $(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
 
 $(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/config.h
+
+$(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/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/config.h
+
+$(BLD)/md5.$(O) : \
+       $(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/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/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/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/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)/sha1.$(O) $(BLD)/sha256.$(O) $(BLD)/sha512.$(O): stamp_BLD
+$(BLD)/filemode.$(O): stamp_BLD
 
 #
 # Headers we would preprocess if we could.
@@ -132,14 +203,14 @@ 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
-       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" \