aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJuanma Barranquero2012-07-09 17:37:43 +0200
committerJuanma Barranquero2012-07-09 17:37:43 +0200
commit52331d2c41bf325fd1b22764fdc230d92b68ab85 (patch)
treed8770a72bbdef90e226ff789e04fc21ffc44b5c4 /lib
parentad0a19b70ec45539c65db17cd14098fce8086c93 (diff)
downloademacs-52331d2c41bf325fd1b22764fdc230d92b68ab85.tar.gz
emacs-52331d2c41bf325fd1b22764fdc230d92b68ab85.zip
lib/makefile.w32-in: Rework dependencies.
(GNU_LIB, NT_INC, C_CTYPE_H, MS_W32_H, CONFIG_H, FILEMODE_H) (FTOASTR_H, FTOASTR_C, GETOPT_INT_H, MD5_H, SHA1_H, SHA256_H) (U64_H, SHA512_H): New macros. (SRC): Redefine to point to src/, not current directory. ($(BLD)/c-ctype.$(O), $(BLD)/c-strcasecmp.$(O)) ($(BLD)/c-strncasecmp.$(O), $(BLD)/dtoastr.$(O)) ($(BLD)/dtotimespec.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)) ($(BLD)/gettime.$(O), $(BLD)/strftime.$(O), $(BLD)/time_r.$(O)) ($(BLD)/timespec-add.$(O), $(BLD)/timespec-sub.$(O), $(BLD)/md5.$(O)) ($(BLD)/sha1.$(O), $(BLD)/sha256.$(O), $(BLD)/sha512.$(O)) ($(BLD)/filemode.$(O)): Update dependencies.
Diffstat (limited to 'lib')
-rw-r--r--lib/makefile.w32-in202
1 files changed, 99 insertions, 103 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index f2853f10cb9..b49195bcb84 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -65,143 +65,139 @@ TAGS: FRC
65### DEPENDENCIES ### 65### DEPENDENCIES ###
66 66
67EMACS_ROOT = .. 67EMACS_ROOT = ..
68SRC = . 68GNU_LIB = .
69SRC = $(EMACS_ROOT)/src
70NT_INC = $(EMACS_ROOT)/nt/inc
71
72C_CTYPE_H = $(GNU_LIB)/c-ctype.h \
73 $(NT_INC)/stdbool.h
74MS_W32_H = $(SRC)/s/ms-w32.h \
75 $(NT_INC)/sys/stat.h
76CONFIG_H = $(SRC)/config.h \
77 $(MS_W32_H)
78FILEMODE_H = $(GNU_LIB)/filemode.h \
79 $(NT_INC)/sys/stat.h
80FTOASTR_H = $(GNU_LIB)/ftoastr.h \
81 $(GNU_LIB)/intprops.h
82FTOASTR_C = $(GNU_LIB)/ftoastr.c \
83 $(CONFIG_H) \
84 $(FTOASTR_H) \
85 $(GNU_LIB)/ftoastr.h
86GETOPT_INT_H = $(GNU_LIB)/getopt_int.h \
87 $(GNU_LIB)/getopt.h
88MD5_H = $(GNU_LIB)/md5.h \
89 $(NT_INC)/stdint.h
90SHA1_H = $(GNU_LIB)/sha1.h \
91 $(NT_INC)/stdint.h
92SHA256_H = $(GNU_LIB)/sha256.h \
93 $(NT_INC)/stdint.h
94U64_H = $(GNU_LIB)/u64.h \
95 $(NT_INC)/stdint.h
96SHA512_H = $(GNU_LIB)/sha512.h \
97 $(U64_H) \
98 $(GNU_LIB)/u64.h
69 99
70$(BLD)/c-ctype.$(O) : \ 100$(BLD)/c-ctype.$(O) : \
71 $(SRC)/c-ctype.c \ 101 $(GNU_LIB)/c-ctype.c \
72 $(SRC)/c-ctype.h \ 102 $(CONFIG_H) \
73 $(EMACS_ROOT)/src/s/ms-w32.h \ 103 $(C_CTYPE_H)
74 $(EMACS_ROOT)/src/config.h
75 104
76$(BLD)/c-strcasecmp.$(O) : \ 105$(BLD)/c-strcasecmp.$(O) : \
77 $(SRC)/c-strcasecmp.c \ 106 $(GNU_LIB)/c-strcasecmp.c \
78 $(SRC)/c-strcase.h \ 107 $(GNU_LIB)/c-strcase.h \
79 $(SRC)/c-ctype.h \ 108 $(CONFIG_H) \
80 $(EMACS_ROOT)/src/s/ms-w32.h \ 109 $(C_CTYPE_H)
81 $(EMACS_ROOT)/src/config.h
82 110
83$(BLD)/c-strncasecmp.$(O) : \ 111$(BLD)/c-strncasecmp.$(O) : \
84 $(SRC)/c-strncasecmp.c \ 112 $(GNU_LIB)/c-strncasecmp.c \
85 $(SRC)/c-strcase.h \ 113 $(GNU_LIB)/c-strcase.h \
86 $(SRC)/c-ctype.h \ 114 $(CONFIG_H) \
87 $(EMACS_ROOT)/src/s/ms-w32.h \ 115 $(C_CTYPE_H)
88 $(EMACS_ROOT)/src/config.h
89 116
90$(BLD)/dtoastr.$(O) : \ 117$(BLD)/dtoastr.$(O) : \
91 $(SRC)/dtoastr.c \ 118 $(GNU_LIB)/dtoastr.c \
92 $(SRC)/ftoastr.c \ 119 $(FTOASTR_C)
93 $(SRC)/ftoastr.h \
94 $(SRC)/intprops.h \
95 $(EMACS_ROOT)/nt/inc/sys/stat.h \
96 $(EMACS_ROOT)/src/s/ms-w32.h \
97 $(EMACS_ROOT)/src/config.h
98 120
99$(BLD)/dtotimespec.$(O) : \ 121$(BLD)/dtotimespec.$(O) : \
100 $(SRC)/dtotimespec.c \ 122 $(GNU_LIB)/dtotimespec.c \
101 $(SRC)/intprops.h \ 123 $(GNU_LIB)/intprops.h \
102 $(SRC)/timespec.h \ 124 $(GNU_LIB)/timespec.h \
103 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 125 $(CONFIG_H)
104 $(EMACS_ROOT)/src/s/ms-w32.h \
105 $(EMACS_ROOT)/src/config.h
106 126
107$(BLD)/getopt.$(O) : \ 127$(BLD)/getopt.$(O) : \
108 $(SRC)/getopt.c \ 128 $(GNU_LIB)/getopt.c \
109 $(SRC)/getopt.h \ 129 $(GNU_LIB)/getopt.h \
110 $(SRC)/getopt_int.h \ 130 $(GNU_LIB)/gettext.h \
111 $(SRC)/gettext.h \ 131 $(NT_INC)/unistd.h \
112 $(EMACS_ROOT)/nt/inc/unistd.h \ 132 $(CONFIG_H) \
113 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 133 $(GETOPT_INT_H)
114 $(EMACS_ROOT)/src/s/ms-w32.h \
115 $(EMACS_ROOT)/src/config.h
116 134
117$(BLD)/getopt1.$(O) : \ 135$(BLD)/getopt1.$(O) : \
118 $(SRC)/getopt1.c \ 136 $(GNU_LIB)/getopt1.c \
119 $(SRC)/getopt.h \ 137 $(GNU_LIB)/getopt.h \
120 $(SRC)/getopt_int.h \ 138 $(CONFIG_H) \
121 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 139 $(GETOPT_INT_H)
122 $(EMACS_ROOT)/src/s/ms-w32.h \
123 $(EMACS_ROOT)/src/config.h
124 140
125$(BLD)/gettime.$(O) : \ 141$(BLD)/gettime.$(O) : \
126 $(SRC)/gettime.c \ 142 $(GNU_LIB)/gettime.c \
127 $(SRC)/timespec.h \ 143 $(GNU_LIB)/timespec.h \
128 $(EMACS_ROOT)/nt/inc/sys/time.h \ 144 $(NT_INC)/sys/time.h \
129 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 145 $(CONFIG_H)
130 $(EMACS_ROOT)/src/s/ms-w32.h \
131 $(EMACS_ROOT)/src/config.h
132 146
133$(BLD)/strftime.$(O) : \ 147$(BLD)/strftime.$(O) : \
134 $(SRC)/strftime.c \ 148 $(GNU_LIB)/strftime.c \
135 $(SRC)/strftime.h \ 149 $(GNU_LIB)/strftime.h \
136 $(EMACS_ROOT)/nt/inc/stdbool.h \ 150 $(NT_INC)/stdbool.h \
137 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 151 $(CONFIG_H)
138 $(EMACS_ROOT)/src/s/ms-w32.h \
139 $(EMACS_ROOT)/src/config.h
140 152
141$(BLD)/time_r.$(O) : \ 153$(BLD)/time_r.$(O) : \
142 $(SRC)/time_r.c \ 154 $(GNU_LIB)/time_r.c \
143 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 155 $(CONFIG_H)
144 $(EMACS_ROOT)/src/s/ms-w32.h \
145 $(EMACS_ROOT)/src/config.h
146 156
147$(BLD)/timespec-add.$(O) : \ 157$(BLD)/timespec-add.$(O) : \
148 $(SRC)/timespec-add.c \ 158 $(GNU_LIB)/timespec-add.c \
149 $(SRC)/intprops.h \ 159 $(GNU_LIB)/intprops.h \
150 $(SRC)/timespec.h \ 160 $(GNU_LIB)/timespec.h \
151 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 161 $(CONFIG_H)
152 $(EMACS_ROOT)/src/s/ms-w32.h \
153 $(EMACS_ROOT)/src/config.h
154 162
155$(BLD)/timespec-sub.$(O) : \ 163$(BLD)/timespec-sub.$(O) : \
156 $(SRC)/timespec-sub.c \ 164 $(GNU_LIB)/timespec-sub.c \
157 $(SRC)/intprops.h \ 165 $(GNU_LIB)/intprops.h \
158 $(SRC)/timespec.h \ 166 $(GNU_LIB)/timespec.h \
159 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 167 $(CONFIG_H)
160 $(EMACS_ROOT)/src/s/ms-w32.h \
161 $(EMACS_ROOT)/src/config.h
162 168
163$(BLD)/md5.$(O) : \ 169$(BLD)/md5.$(O) : \
164 $(SRC)/md5.c \ 170 $(GNU_LIB)/md5.c \
165 $(SRC)/md5.h \ 171 $(NT_INC)/stdalign.h \
166 $(EMACS_ROOT)/nt/inc/stdint.h \ 172 $(NT_INC)/stdint.h \
167 $(EMACS_ROOT)/nt/inc/stdalign.h \ 173 $(CONFIG_H) \
168 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 174 $(MD5_H)
169 $(EMACS_ROOT)/src/s/ms-w32.h \
170 $(EMACS_ROOT)/src/config.h
171 175
172$(BLD)/sha1.$(O) : \ 176$(BLD)/sha1.$(O) : \
173 $(SRC)/sha1.c \ 177 $(GNU_LIB)/sha1.c \
174 $(SRC)/sha1.h \ 178 $(NT_INC)/stdalign.h \
175 $(EMACS_ROOT)/nt/inc/stdint.h \ 179 $(NT_INC)/stdint.h \
176 $(EMACS_ROOT)/nt/inc/stdalign.h \ 180 $(CONFIG_H) \
177 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 181 $(SHA1_H)
178 $(EMACS_ROOT)/src/s/ms-w32.h \
179 $(EMACS_ROOT)/src/config.h
180 182
181$(BLD)/sha256.$(O) : \ 183$(BLD)/sha256.$(O) : \
182 $(SRC)/sha256.c \ 184 $(GNU_LIB)/sha256.c \
183 $(SRC)/sha256.h \ 185 $(NT_INC)/stdalign.h \
184 $(EMACS_ROOT)/nt/inc/stdint.h \ 186 $(NT_INC)/stdint.h \
185 $(EMACS_ROOT)/nt/inc/stdalign.h \ 187 $(CONFIG_H) \
186 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 188 $(SHA256_H)
187 $(EMACS_ROOT)/src/s/ms-w32.h \
188 $(EMACS_ROOT)/src/config.h
189 189
190$(BLD)/sha512.$(O) : \ 190$(BLD)/sha512.$(O) : \
191 $(SRC)/sha512.c \ 191 $(GNU_LIB)/sha512.c \
192 $(SRC)/sha512.h \ 192 $(NT_INC)/stdalign.h \
193 $(EMACS_ROOT)/nt/inc/stdint.h \ 193 $(NT_INC)/stdint.h \
194 $(EMACS_ROOT)/nt/inc/stdalign.h \ 194 $(CONFIG_H) \
195 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 195 $(SHA512_H)
196 $(EMACS_ROOT)/src/s/ms-w32.h \
197 $(EMACS_ROOT)/src/config.h
198 196
199$(BLD)/filemode.$(O) : \ 197$(BLD)/filemode.$(O) : \
200 $(SRC)/filemode.c \ 198 $(GNU_LIB)/filemode.c \
201 $(SRC)/filemode.h \ 199 $(CONFIG_H) \
202 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 200 $(FILEMODE_H)
203 $(EMACS_ROOT)/src/s/ms-w32.h \
204 $(EMACS_ROOT)/src/config.h
205 201
206# The following dependencies are for supporting parallel builds, where 202# The following dependencies are for supporting parallel builds, where
207# we must make sure $(BLD) exists before any compilation starts. 203# we must make sure $(BLD) exists before any compilation starts.