QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-10 16:39:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix cygwin make dependencies

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5951)
This commit is contained in:
Bernd Edlinger 2018-04-13 21:41:14 +02:00
parent 4442061532
commit 49bb4dd049
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configurations/unix-Makefile.tmpl
View File

@ -390,9 +390,13 @@ uninstall: uninstall_docs uninstall_sw
libclean: libclean:
@set -e; for s in $(SHLIB_INFO); do \ @set -e; for s in $(SHLIB_INFO); do \
if [ "$$s" = ";" ]; then continue; fi; \
s1=`echo "$$s" | cut -f1 -d";"`; \ s1=`echo "$$s" | cut -f1 -d";"`; \
s2=`echo "$$s" | cut -f2 -d";"`; \ s2=`echo "$$s" | cut -f2 -d";"`; \
$(ECHO) $(RM) $$s1; \ $(ECHO) $(RM) $$s1; {- output_off() unless windowsdll(); "" -}\
$(RM) apps/$$s1; \
$(RM) test/$$s1; \
$(RM) fuzz/$$s1; {- output_on() unless windowsdll(); "" -}\
$(RM) $$s1; \ $(RM) $$s1; \
if [ "$$s1" != "$$s2" ]; then \ if [ "$$s1" != "$$s2" ]; then \
$(ECHO) $(RM) $$s2; \ $(ECHO) $(RM) $$s2; \
@ -979,7 +983,6 @@ EOF
$cmd = '$(RC)'; $cmd = '$(RC)';
$cmdflags = '$(RCFLAGS)'; $cmdflags = '$(RCFLAGS)';
$cmdcompile = ''; $cmdcompile = '';
$makedepprog = undef;
} elsif (grep /\.(cc|cpp)$/, @srcs) { } elsif (grep /\.(cc|cpp)$/, @srcs) {
$cmd = '$(CXX)'; $cmd = '$(CXX)';
$cmdcompile = ' -c'; $cmdcompile = ' -c';
@ -1014,7 +1017,8 @@ EOF
$obj$objext: $deps $obj$objext: $deps
$cmd $incs $cmdflags -c -o \$\@ $srcs $cmd $incs $cmdflags -c -o \$\@ $srcs
EOF EOF
} elsif (defined $makedepprog && $makedepprog !~ /\/makedepend/) { } elsif (defined $makedepprog && $makedepprog !~ /\/makedepend/
&& !grep /\.rc$/, @srcs) {
$recipe .= <<"EOF"; $recipe .= <<"EOF";
$obj$objext: $deps $obj$objext: $deps
$cmd $incs $cmdflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs $cmd $incs $cmdflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs