3 @@ -273,17 +273,17 @@ build_all: build_libs build_apps build_t
4 build_libs: build_crypto build_ssl build_engines
7 - @dir=crypto; target=all; $(BUILD_ONE_CMD)
9 - @dir=ssl; target=all; $(BUILD_ONE_CMD)
11 - @dir=engines; target=all; $(BUILD_ONE_CMD)
13 - @dir=apps; target=all; $(BUILD_ONE_CMD)
15 - @dir=test; target=all; $(BUILD_ONE_CMD)
17 - @dir=tools; target=all; $(BUILD_ONE_CMD)
18 + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
19 +build_ssl: build_crypto
20 + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
21 +build_engines: build_crypto
22 + +@dir=engines; target=all; $(BUILD_ONE_CMD)
23 +build_apps: build_libs
24 + +@dir=apps; target=all; $(BUILD_ONE_CMD)
25 +build_tests: build_libs
26 + +@dir=test; target=all; $(BUILD_ONE_CMD)
27 +build_tools: build_libs
28 + +@dir=tools; target=all; $(BUILD_ONE_CMD)
30 all_testapps: build_libs build_testapps
32 @@ -455,7 +455,7 @@ report:
33 @$(PERL) util/selftest.pl
36 - @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
37 + +@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
40 @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
41 @@ -533,9 +533,9 @@ dist:
43 (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
45 -install: all install_sw
50 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
51 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
52 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
53 @@ -544,12 +544,19 @@ install_sw:
54 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
55 $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
56 $(INSTALL_PREFIX)$(OPENSSLDIR)/private
57 + @$(PERL) $(TOP)/util/mkdir-p.pl \
58 + $(INSTALL_PREFIX)$(MANDIR)/man1 \
59 + $(INSTALL_PREFIX)$(MANDIR)/man3 \
60 + $(INSTALL_PREFIX)$(MANDIR)/man5 \
61 + $(INSTALL_PREFIX)$(MANDIR)/man7
63 +install_sw: install_dirs
64 @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
66 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
67 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
69 - @set -e; target=install; $(RECURSIVE_BUILD_CMD)
70 + +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
71 @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
73 if [ -f "$$i" ]; then \
74 @@ -629,12 +636,7 @@ install_html_docs:
79 - @$(PERL) $(TOP)/util/mkdir-p.pl \
80 - $(INSTALL_PREFIX)$(MANDIR)/man1 \
81 - $(INSTALL_PREFIX)$(MANDIR)/man3 \
82 - $(INSTALL_PREFIX)$(MANDIR)/man5 \
83 - $(INSTALL_PREFIX)$(MANDIR)/man7
84 +install_docs: install_dirs
85 @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
90 @@ -120,6 +120,7 @@ SYMLINK_SO= \
93 if [ -n "$$SHLIB_SOVER" ]; then \
94 + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
95 ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
96 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
100 @@ -88,11 +88,11 @@ testapps:
101 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
104 - @target=all; $(RECURSIVE_MAKE)
105 + +@target=all; $(RECURSIVE_MAKE)
108 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
109 - @target=files; $(RECURSIVE_MAKE)
110 + +@target=files; $(RECURSIVE_MAKE)
113 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
114 @@ -103,7 +103,7 @@ links:
115 # lib: $(LIB): are splitted to avoid end-less loop
119 +$(LIB): $(LIBOBJ) | subdirs
120 $(AR) $(LIB) $(LIBOBJ)
121 [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
122 $(RANLIB) $(LIB) || echo Never mind.
123 @@ -114,7 +114,7 @@ shared: buildinf.h lib subdirs
127 - @target=lib; $(RECURSIVE_MAKE)
128 + +@target=lib; $(RECURSIVE_MAKE)
131 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
132 @@ -123,7 +123,7 @@ install:
133 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
134 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
136 - @target=install; $(RECURSIVE_MAKE)
137 + +@target=install; $(RECURSIVE_MAKE)
140 @target=lint; $(RECURSIVE_MAKE)
141 --- a/engines/Makefile
142 +++ b/engines/Makefile
143 @@ -72,7 +72,7 @@ top:
148 +lib: $(LIBOBJ) | subdirs
149 @if [ -n "$(SHARED_LIBS)" ]; then \
151 for l in $(LIBNAMES); do \
152 @@ -89,7 +89,7 @@ lib: $(LIBOBJ)
156 - @target=all; $(RECURSIVE_MAKE)
157 + +@target=all; $(RECURSIVE_MAKE)
160 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
161 @@ -128,7 +128,7 @@ install:
162 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
165 - @target=install; $(RECURSIVE_MAKE)
166 + +@target=install; $(RECURSIVE_MAKE)
172 @@ -124,7 +124,7 @@ install:
176 -tests: exe apps $(TESTS)
180 @(cd ..; $(MAKE) DIRS=apps all)
181 @@ -365,109 +365,109 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$
182 link_app.$${shlib_target}
184 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
185 - @target=$(RSATEST); $(BUILD_CMD)
186 + +@target=$(RSATEST); $(BUILD_CMD)
188 $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
189 - @target=$(BNTEST); $(BUILD_CMD)
190 + +@target=$(BNTEST); $(BUILD_CMD)
192 $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
193 - @target=$(ECTEST); $(BUILD_CMD)
194 + +@target=$(ECTEST); $(BUILD_CMD)
196 $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
197 - @target=$(EXPTEST); $(BUILD_CMD)
198 + +@target=$(EXPTEST); $(BUILD_CMD)
200 $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
201 - @target=$(IDEATEST); $(BUILD_CMD)
202 + +@target=$(IDEATEST); $(BUILD_CMD)
204 $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
205 - @target=$(MD2TEST); $(BUILD_CMD)
206 + +@target=$(MD2TEST); $(BUILD_CMD)
208 $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
209 - @target=$(SHATEST); $(BUILD_CMD)
210 + +@target=$(SHATEST); $(BUILD_CMD)
212 $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
213 - @target=$(SHA1TEST); $(BUILD_CMD)
214 + +@target=$(SHA1TEST); $(BUILD_CMD)
216 $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
217 - @target=$(SHA256TEST); $(BUILD_CMD)
218 + +@target=$(SHA256TEST); $(BUILD_CMD)
220 $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
221 - @target=$(SHA512TEST); $(BUILD_CMD)
222 + +@target=$(SHA512TEST); $(BUILD_CMD)
224 $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
225 - @target=$(RMDTEST); $(BUILD_CMD)
226 + +@target=$(RMDTEST); $(BUILD_CMD)
228 $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
229 - @target=$(MDC2TEST); $(BUILD_CMD)
230 + +@target=$(MDC2TEST); $(BUILD_CMD)
232 $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
233 - @target=$(MD4TEST); $(BUILD_CMD)
234 + +@target=$(MD4TEST); $(BUILD_CMD)
236 $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
237 - @target=$(MD5TEST); $(BUILD_CMD)
238 + +@target=$(MD5TEST); $(BUILD_CMD)
240 $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
241 - @target=$(HMACTEST); $(BUILD_CMD)
242 + +@target=$(HMACTEST); $(BUILD_CMD)
244 $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
245 - @target=$(WPTEST); $(BUILD_CMD)
246 + +@target=$(WPTEST); $(BUILD_CMD)
248 $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
249 - @target=$(RC2TEST); $(BUILD_CMD)
250 + +@target=$(RC2TEST); $(BUILD_CMD)
252 $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
253 - @target=$(BFTEST); $(BUILD_CMD)
254 + +@target=$(BFTEST); $(BUILD_CMD)
256 $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
257 - @target=$(CASTTEST); $(BUILD_CMD)
258 + +@target=$(CASTTEST); $(BUILD_CMD)
260 $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
261 - @target=$(RC4TEST); $(BUILD_CMD)
262 + +@target=$(RC4TEST); $(BUILD_CMD)
264 $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
265 - @target=$(RC5TEST); $(BUILD_CMD)
266 + +@target=$(RC5TEST); $(BUILD_CMD)
268 $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
269 - @target=$(DESTEST); $(BUILD_CMD)
270 + +@target=$(DESTEST); $(BUILD_CMD)
272 $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
273 - @target=$(RANDTEST); $(BUILD_CMD)
274 + +@target=$(RANDTEST); $(BUILD_CMD)
276 $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
277 - @target=$(DHTEST); $(BUILD_CMD)
278 + +@target=$(DHTEST); $(BUILD_CMD)
280 $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
281 - @target=$(DSATEST); $(BUILD_CMD)
282 + +@target=$(DSATEST); $(BUILD_CMD)
284 $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
285 - @target=$(METHTEST); $(BUILD_CMD)
286 + +@target=$(METHTEST); $(BUILD_CMD)
288 $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
289 - @target=$(SSLTEST); $(FIPS_BUILD_CMD)
290 + +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
292 $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
293 - @target=$(ENGINETEST); $(BUILD_CMD)
294 + +@target=$(ENGINETEST); $(BUILD_CMD)
296 $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
297 - @target=$(EVPTEST); $(BUILD_CMD)
298 + +@target=$(EVPTEST); $(BUILD_CMD)
300 $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
301 - @target=$(ECDSATEST); $(BUILD_CMD)
302 + +@target=$(ECDSATEST); $(BUILD_CMD)
304 $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
305 - @target=$(ECDHTEST); $(BUILD_CMD)
306 + +@target=$(ECDHTEST); $(BUILD_CMD)
308 $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
309 - @target=$(IGETEST); $(BUILD_CMD)
310 + +@target=$(IGETEST); $(BUILD_CMD)
312 $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
313 - @target=$(JPAKETEST); $(BUILD_CMD)
314 + +@target=$(JPAKETEST); $(BUILD_CMD)
316 $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
317 - @target=$(ASN1TEST); $(BUILD_CMD)
318 + +@target=$(ASN1TEST); $(BUILD_CMD)
320 $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
321 - @target=$(SRPTEST); $(BUILD_CMD)
322 + +@target=$(SRPTEST); $(BUILD_CMD)
324 #$(AESTEST).o: $(AESTEST).c
325 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
326 @@ -480,7 +480,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLI
329 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
330 - @target=dummytest; $(BUILD_CMD)
331 + +@target=dummytest; $(BUILD_CMD)
333 # DO NOT DELETE THIS LINE -- make depend depends on it.