This is particularly uesful for places where we don't care about the
tools, tests, etc.
---
 Makefile.org | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index 4f5bff9..be844aa 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -134,7 +134,9 @@ FIPSCANLIB=
 
 BASEADDR=
 
-DIRS=   crypto ssl engines apps test tools
+LIBDIRS= crypto ssl engines
+EXEDIRS= apps test tools
+DIRS= $(LIBDIRS) $(EXEDIRS)
 ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
 
@@ -267,7 +269,7 @@ BUILD_CMD=  if [ -d "$$dir" ]; then \
                $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target 
\
            ) || exit 1; \
            fi
-RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
+RECURSIVE_BUILD_CMD=for dir in $${DIRS:-$(DIRS)}; do $(BUILD_CMD); done
 BUILD_ONE_CMD=\
        if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \
                $(BUILD_CMD); \
@@ -545,14 +547,19 @@ install: all install_docs install_sw
 
 uninstall: uninstall_sw uninstall_docs
 
-install_sw:
+install_sw: install_libs
+       @set -e; target=install; DIRS="$(EXEDIRS)"; $(RECURSIVE_BUILD_CMD)
+
+install_libs: install_common
+       @set -e; target=install; DIRS="$(LIBDIRS)"; $(RECURSIVE_BUILD_CMD)
+
+install_common:
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS)
        @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
        do \
        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
-       @set -e; target=install; $(RECURSIVE_BUILD_CMD)
        @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
        do \
                if [ -f "$$i" ]; then \
-- 
2.1.0


_______________________________________________
openssl-dev mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-dev

Reply via email to