@ -1,35 +1,30 @@
--- a/Makefile.org
--- a/Makefile.org
+++ b/Makefile.org
+++ b/Makefile.org
@@ -27 7,17 +277 ,17 @@ build_libcrypto: build_crypto build_engi
@@ -27 8,17 +278 ,17 @@ build_libcrypto: build_crypto build_engi
build_libssl: build_ssl libssl.pc
build_libssl: build_ssl libssl.pc
build_crypto:
build_crypto:
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_ssl:
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines:
- @dir=engines; target=all; $(BUILD_ONE_CMD)
-build_apps:
- @dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests:
- @dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools:
- @dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
+build_ssl: build_crypto
build_ssl: build_crypto
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
+build_engines: build_crypto
build_engines: build_crypto
- @dir=engines; target=all; $(BUILD_ONE_CMD)
+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
+build_apps: build_libs
build_apps: build_libs
- @dir=apps; target=all; $(BUILD_ONE_CMD)
+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
+build_tests: build_libs
build_tests: build_libs
- @dir=test; target=all; $(BUILD_ONE_CMD)
+ +@dir=test; target=all; $(BUILD_ONE_CMD)
+ +@dir=test; target=all; $(BUILD_ONE_CMD)
+build_tools: build_libs
build_tools: build_libs
- @dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
all_testapps: build_libs build_testapps
all_testapps: build_libs build_testapps
build_testapps:
build_testapps:
@@ -4 59,7 +459 ,7 @@ update: errors stacks util/libeay.num ut
@@ -4 60,7 +460 ,7 @@ update: errors stacks util/libeay.num ut
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
depend:
depend:
@ -38,7 +33,7 @@
lint:
lint:
@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
@@ -52 1,9 +521 ,9 @@ dist:
@@ -52 2,9 +522 ,9 @@ dist:
dist_pem_h:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@ -50,7 +45,7 @@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
@@ -53 2,12 +532 ,19 @@ install_sw:
@@ -53 3,12 +533 ,19 @@ install_sw:
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
@ -71,7 +66,7 @@
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \
do \
if [ -f "$$i" ]; then \
if [ -f "$$i" ]; then \
@@ -62 1,12 +628 ,7 @@ install_html_docs:
@@ -62 2,12 +629 ,7 @@ install_html_docs:
done; \
done; \
done
done
@ -169,7 +164,7 @@
ctags $(SRC)
ctags $(SRC)
--- a/test/Makefile
--- a/test/Makefile
+++ b/test/Makefile
+++ b/test/Makefile
@@ -13 3,7 +133 ,7 @@ install:
@@ -13 4,7 +134 ,7 @@ install:
tags:
tags:
ctags $(SRC)
ctags $(SRC)
@ -178,7 +173,7 @@
apps:
apps:
@(cd ..; $(MAKE) DIRS=apps all)
@(cd ..; $(MAKE) DIRS=apps all)
@@ -53 0,7 +530,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMET
@@ -53 8,7 +538,7 @@ $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEX
# fi
# fi
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)