From f1f81baa2cc69ea0c0b13118d3559ddfb285305b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 6 Apr 2011 16:16:43 +0200 Subject: [PATCH] lib/makefile.w32-in: Adapt to changes in 2011-04-06T05:19:39Z!eggert@cs.ucla.edu. * lib/makefile.w32-in (GNULIBOBJS): Add careadlinkat.$(O). ($(BLD)/careadlinkat.$(O)): New target. ($(BLD)/dtoastr.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)) ($(BLD)/strftime.$(O), $(BLD)/time_r.$(O), $(BLD)/md5.$(O)): Update dependencies. --- ChangeLog | 8 ++++++++ lib/makefile.w32-in | 24 +++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67b95f36d44..c57bcabef41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-04-06 Juanma Barranquero + + * lib/makefile.w32-in (GNULIBOBJS): Add careadlinkat.$(O). + ($(BLD)/careadlinkat.$(O)): New target. + ($(BLD)/dtoastr.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)) + ($(BLD)/strftime.$(O), $(BLD)/time_r.$(O), $(BLD)/md5.$(O)): + Update dependencies. + 2011-04-06 Paul Eggert Fix more problems found by GCC 4.6.0's static checks. diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 289f6bffdb9..895cd0b8369 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -29,7 +29,8 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \ $(BLD)/strftime.$(O) \ $(BLD)/time_r.$(O) \ $(BLD)/md5.$(O) \ - $(BLD)/filemode.$(O) + $(BLD)/filemode.$(O) \ + $(BLD)/careadlinkat.$(O) # # Build the library @@ -60,6 +61,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 @@ -68,6 +70,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 @@ -76,6 +81,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 @@ -84,13 +90,14 @@ $(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 @@ -99,6 +106,7 @@ $(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/m/intel386.h \ $(EMACS_ROOT)/src/config.h @@ -111,12 +119,22 @@ $(BLD)/filemode.$(O) : \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h +$(BLD)/careadlinkat.$(O) : \ + $(SRC)/careadlinkat.c \ + $(SRC)/careadlinkat.h \ + $(SRC)/allocator.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 + # 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 +$(BLD)/filemode.$(O) $(BLD)/careadlinkat.$(O): stamp_BLD # # Headers we would preprocess if we could. -- 2.11.4.GIT