generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Address comments.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Ben Laurie 2016-02-14 18:41:52 +00:00
parent 18c7e6dda8
commit ecd44a3c1e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configurations/descrip.mms.tmpl
View File

@ -207,7 +207,7 @@ build_engines : $(ENGINES)
build_apps : $(PROGRAMS), $(SCRIPTS) build_apps : $(PROGRAMS), $(SCRIPTS)
build_tests : $(TESTPROGS) build_tests : $(TESTPROGS)
test tests : build_tests, rehash test tests : build_apps, build_engines, build_tests, rehash
SET DEFAULT [.test]{- move("test") -} SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -} DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -} DEFINE BLDTOP {- builddir() -}
@ -293,7 +293,7 @@ install_dev : check_INSTALLTOP
@ {- output_off() if $config{no_shared}; "" -} ! @ {- output_off() if $config{no_shared}; "" -} !
{- join("\n ", {- join("\n ",
map { "COPY/PROT=W:RE $_.EXE ossl_installroot:['arch'.LIB]" } map { "COPY/PROT=W:RE $_.EXE ossl_installroot:['arch'.LIB]" }
map { $unified_info{sharednames}->{$_} || () } map { $unified_info{sharednames}->{$_} || () }
@{$unified_info{libraries}}) -} @{$unified_info{libraries}}) -}
@ {- output_on() if $config{no_shared}; "" -} ! @ {- output_on() if $config{no_shared}; "" -} !

4
Configurations/unix-Makefile.tmpl
View File

@ -151,7 +151,7 @@ build_engines: $(ENGINES)
build_apps: $(PROGRAMS) $(SCRIPTS) build_apps: $(PROGRAMS) $(SCRIPTS)
build_tests: $(TESTPROGS) build_tests: $(TESTPROGS)
test tests: build_tests build_apps build_engines build_libs rehash test tests: build_tests build_apps build_engines rehash
( cd test; \ ( cd test; \
SRCTOP=../$(SRCDIR) \ SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \ BLDTOP=../$(BLDDIR) \
@ -575,7 +575,7 @@ dist:
# Helper targets ##################################################### # Helper targets #####################################################
rehash: link-utils copy-certs rehash: link-utils copy-certs build_apps
@if [ -z "$(CROSS_COMPILE)" ]; then \ @if [ -z "$(CROSS_COMPILE)" ]; then \
(OPENSSL="$(BLDDIR)/util/shlib_wrap.sh apps/openssl"; \ (OPENSSL="$(BLDDIR)/util/shlib_wrap.sh apps/openssl"; \
[ -x "$(BLDDIR)/openssl.exe" ] && OPENSSL="$(BLDDIR)/openssl.exe" || :; \ [ -x "$(BLDDIR)/openssl.exe" ] && OPENSSL="$(BLDDIR)/openssl.exe" || :; \