aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-06 16:16:43 +0200
committerJuanma Barranquero2011-04-06 16:16:43 +0200
commitf1f81baa2cc69ea0c0b13118d3559ddfb285305b (patch)
treee619f4ec596c6f5c80e0afd2bb3dc866b1584d4c
parent42b237655fd30f72a0784c2e0c3b86d28277e893 (diff)
downloademacs-f1f81baa2cc69ea0c0b13118d3559ddfb285305b.tar.gz
emacs-f1f81baa2cc69ea0c0b13118d3559ddfb285305b.zip
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.
-rw-r--r--ChangeLog8
-rw-r--r--lib/makefile.w32-in24
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 @@
12011-04-06 Juanma Barranquero <lekktu@gmail.com>
2
3 * lib/makefile.w32-in (GNULIBOBJS): Add careadlinkat.$(O).
4 ($(BLD)/careadlinkat.$(O)): New target.
5 ($(BLD)/dtoastr.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O))
6 ($(BLD)/strftime.$(O), $(BLD)/time_r.$(O), $(BLD)/md5.$(O)):
7 Update dependencies.
8
12011-04-06 Paul Eggert <eggert@cs.ucla.edu> 92011-04-06 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 Fix more problems found by GCC 4.6.0's static checks. 11 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) \
29 $(BLD)/strftime.$(O) \ 29 $(BLD)/strftime.$(O) \
30 $(BLD)/time_r.$(O) \ 30 $(BLD)/time_r.$(O) \
31 $(BLD)/md5.$(O) \ 31 $(BLD)/md5.$(O) \
32 $(BLD)/filemode.$(O) 32 $(BLD)/filemode.$(O) \
33 $(BLD)/careadlinkat.$(O)
33 34
34# 35#
35# Build the library 36# Build the library
@@ -60,6 +61,7 @@ $(BLD)/dtoastr.$(O) : \
60 $(SRC)/ftoastr.c \ 61 $(SRC)/ftoastr.c \
61 $(SRC)/ftoastr.h \ 62 $(SRC)/ftoastr.h \
62 $(SRC)/intprops.h \ 63 $(SRC)/intprops.h \
64 $(EMACS_ROOT)/nt/inc/sys/stat.h \
63 $(EMACS_ROOT)/src/s/ms-w32.h \ 65 $(EMACS_ROOT)/src/s/ms-w32.h \
64 $(EMACS_ROOT)/src/m/intel386.h \ 66 $(EMACS_ROOT)/src/m/intel386.h \
65 $(EMACS_ROOT)/src/config.h 67 $(EMACS_ROOT)/src/config.h
@@ -68,6 +70,9 @@ $(BLD)/getopt.$(O) : \
68 $(SRC)/getopt.c \ 70 $(SRC)/getopt.c \
69 $(SRC)/getopt.h \ 71 $(SRC)/getopt.h \
70 $(SRC)/getopt_int.h \ 72 $(SRC)/getopt_int.h \
73 $(SRC)/gettext.h \
74 $(EMACS_ROOT)/nt/inc/unistd.h \
75 $(EMACS_ROOT)/nt/inc/sys/stat.h \
71 $(EMACS_ROOT)/src/s/ms-w32.h \ 76 $(EMACS_ROOT)/src/s/ms-w32.h \
72 $(EMACS_ROOT)/src/m/intel386.h \ 77 $(EMACS_ROOT)/src/m/intel386.h \
73 $(EMACS_ROOT)/src/config.h 78 $(EMACS_ROOT)/src/config.h
@@ -76,6 +81,7 @@ $(BLD)/getopt1.$(O) : \
76 $(SRC)/getopt1.c \ 81 $(SRC)/getopt1.c \
77 $(SRC)/getopt.h \ 82 $(SRC)/getopt.h \
78 $(SRC)/getopt_int.h \ 83 $(SRC)/getopt_int.h \
84 $(EMACS_ROOT)/nt/inc/sys/stat.h \
79 $(EMACS_ROOT)/src/s/ms-w32.h \ 85 $(EMACS_ROOT)/src/s/ms-w32.h \
80 $(EMACS_ROOT)/src/m/intel386.h \ 86 $(EMACS_ROOT)/src/m/intel386.h \
81 $(EMACS_ROOT)/src/config.h 87 $(EMACS_ROOT)/src/config.h
@@ -84,13 +90,14 @@ $(BLD)/strftime.$(O) : \
84 $(SRC)/strftime.c \ 90 $(SRC)/strftime.c \
85 $(SRC)/strftime.h \ 91 $(SRC)/strftime.h \
86 $(EMACS_ROOT)/nt/inc/stdbool.h \ 92 $(EMACS_ROOT)/nt/inc/stdbool.h \
93 $(EMACS_ROOT)/nt/inc/sys/stat.h \
87 $(EMACS_ROOT)/src/s/ms-w32.h \ 94 $(EMACS_ROOT)/src/s/ms-w32.h \
88 $(EMACS_ROOT)/src/m/intel386.h \ 95 $(EMACS_ROOT)/src/m/intel386.h \
89 $(EMACS_ROOT)/src/config.h 96 $(EMACS_ROOT)/src/config.h
90 97
91$(BLD)/time_r.$(O) : \ 98$(BLD)/time_r.$(O) : \
92 $(SRC)/time_r.c \ 99 $(SRC)/time_r.c \
93 $(EMACS_ROOT)/nt/inc/stdbool.h \ 100 $(EMACS_ROOT)/nt/inc/sys/stat.h \
94 $(EMACS_ROOT)/src/s/ms-w32.h \ 101 $(EMACS_ROOT)/src/s/ms-w32.h \
95 $(EMACS_ROOT)/src/m/intel386.h \ 102 $(EMACS_ROOT)/src/m/intel386.h \
96 $(EMACS_ROOT)/src/config.h 103 $(EMACS_ROOT)/src/config.h
@@ -99,6 +106,7 @@ $(BLD)/md5.$(O) : \
99 $(SRC)/md5.c \ 106 $(SRC)/md5.c \
100 $(SRC)/md5.h \ 107 $(SRC)/md5.h \
101 $(EMACS_ROOT)/nt/inc/stdint.h \ 108 $(EMACS_ROOT)/nt/inc/stdint.h \
109 $(EMACS_ROOT)/nt/inc/sys/stat.h \
102 $(EMACS_ROOT)/src/s/ms-w32.h \ 110 $(EMACS_ROOT)/src/s/ms-w32.h \
103 $(EMACS_ROOT)/src/m/intel386.h \ 111 $(EMACS_ROOT)/src/m/intel386.h \
104 $(EMACS_ROOT)/src/config.h 112 $(EMACS_ROOT)/src/config.h
@@ -111,12 +119,22 @@ $(BLD)/filemode.$(O) : \
111 $(EMACS_ROOT)/src/m/intel386.h \ 119 $(EMACS_ROOT)/src/m/intel386.h \
112 $(EMACS_ROOT)/src/config.h 120 $(EMACS_ROOT)/src/config.h
113 121
122$(BLD)/careadlinkat.$(O) : \
123 $(SRC)/careadlinkat.c \
124 $(SRC)/careadlinkat.h \
125 $(SRC)/allocator.h \
126 $(EMACS_ROOT)/nt/inc/unistd.h \
127 $(EMACS_ROOT)/nt/inc/sys/stat.h \
128 $(EMACS_ROOT)/src/s/ms-w32.h \
129 $(EMACS_ROOT)/src/m/intel386.h \
130 $(EMACS_ROOT)/src/config.h
131
114# The following dependencies are for supporting parallel builds, where 132# The following dependencies are for supporting parallel builds, where
115# we must make sure $(BLD) exists before any compilation starts. 133# we must make sure $(BLD) exists before any compilation starts.
116# 134#
117$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD 135$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
118$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD 136$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
119$(BLD)/filemode.$(O): stamp_BLD 137$(BLD)/filemode.$(O) $(BLD)/careadlinkat.$(O): stamp_BLD
120 138
121# 139#
122# Headers we would preprocess if we could. 140# Headers we would preprocess if we could.