diff options
author | Andy Polyakov <appro@openssl.org> | 2005-05-15 23:53:34 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2005-05-15 23:53:34 +0000 |
commit | 734540f887c6b47349913d3f21c7947c97279448 (patch) | |
tree | 52ad6539daaa9e11a62324a60369b895bf6dd907 /Makefile.org | |
parent | 804515425aa520a186c4d1b919739d1a04d782e5 (diff) |
Consolidate BUILDENV [idea is to keep all variables in one place].
Diffstat (limited to 'Makefile.org')
-rw-r--r-- | Makefile.org | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 408c2ff54f..a3ef81ca5b 100644 --- a/Makefile.org +++ b/Makefile.org @@ -148,6 +148,7 @@ all: Makefile build_all openssl.pc BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' \ + LIBRPATH='$(INSTALLTOP)/lib' \ CC='${CC}' CFLAG='${CFLAG}' \ AS='${CC}' ASFLAG='${CFLAG} -c' \ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ @@ -168,11 +169,14 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \ if [ -d "$$dir" ]; then \ (cd $$dir && echo "making $$target in $$dir..." && \ - $(MAKE) -e $(BUILDENV) $$target ) || exit 1; \ + $(MAKE) $(BUILDENV) $$target ) || exit 1; \ else \ $(MAKE) $$dir; \ fi; fi +reflect: + [ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BIULDENV) + sub_all: build_all build_all: build_libs build_apps build_tests build_tools @@ -335,7 +339,7 @@ test: tests tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); + $(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); util/opensslwrap.sh version -a report: |