3 @@ -274,17 +274,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 @@ -453,7 +453,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 @@ -531,9 +531,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 @@ -542,12 +542,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 @@ -631,12 +638,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 @@ -85,11 +85,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 "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
109 - @target=files; $(RECURSIVE_MAKE)
110 + +@target=files; $(RECURSIVE_MAKE)
113 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
114 @@ -100,7 +100,7 @@ links:
115 # lib: $(LIB): are splitted to avoid end-less loop
119 +$(LIB): $(LIBOBJ) | subdirs
120 $(AR) $(LIB) $(LIBOBJ)
121 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
122 $(RANLIB) $(LIB) || echo Never mind.
123 @@ -111,7 +111,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 @@ -120,7 +120,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 @@ -133,7 +133,7 @@ install:
176 -tests: exe apps $(TESTS)
180 @(cd ..; $(MAKE) DIRS=apps all)
181 @@ -529,7 +529,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMET
184 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
185 - @target=dummytest; $(BUILD_CMD)
186 + +@target=dummytest; $(BUILD_CMD)
188 # DO NOT DELETE THIS LINE -- make depend depends on it.