The branch master has been updated
via b0a97931fbfd5c84e1ac031cb8a8d213d437fec5 (commit)
via 49bb4dd0499e93c43e1408ebbf0f58f357eeae38 (commit)
from 4442061532fb1a98c22609bf37303b77716df624 (commit)
- Log -----------------------------------------------------------------
commit b0a97931fbfd5c84e1ac031cb8a8d213d437fec5
Author: Bernd Edlinger <bernd.edlin...@hotmail.de>
Date: Fri Apr 13 23:24:01 2018 +0200
Remove mandatory generated files too
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5951)
commit 49bb4dd0499e93c43e1408ebbf0f58f357eeae38
Author: Bernd Edlinger <bernd.edlin...@hotmail.de>
Date: Fri Apr 13 21:41:14 2018 +0200
Fix cygwin make dependencies
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5951)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 39df5cd..f23dff4 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -390,9 +390,13 @@ uninstall: uninstall_docs uninstall_sw
libclean:
@set -e; for s in $(SHLIB_INFO); do \
+ if [ "$$s" = ";" ]; then continue; fi; \
s1=`echo "$$s" | cut -f1 -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; \
if [ "$$s1" != "$$s2" ]; then \
$(ECHO) $(RM) $$s2; \
@@ -404,7 +408,7 @@ libclean:
clean: libclean
$(RM) $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
- $(RM) $(GENERATED)
+ $(RM) $(GENERATED_MANDATORY) $(GENERATED)
-$(RM) `find . -name '*{- $depext -}' -a \! -path "./.git/*"`
-$(RM) `find . -name '*{- $objext -}' -a \! -path "./.git/*"`
$(RM) core
@@ -979,7 +983,6 @@ EOF
$cmd = '$(RC)';
$cmdflags = '$(RCFLAGS)';
$cmdcompile = '';
- $makedepprog = undef;
} elsif (grep /\.(cc|cpp)$/, @srcs) {
$cmd = '$(CXX)';
$cmdcompile = ' -c';
@@ -1014,7 +1017,8 @@ EOF
$obj$objext: $deps
$cmd $incs $cmdflags -c -o \$\@ $srcs
EOF
- } elsif (defined $makedepprog && $makedepprog !~ /\/makedepend/) {
+ } elsif (defined $makedepprog && $makedepprog !~ /\/makedepend/
+ && !grep /\.rc$/, @srcs) {
$recipe .= <<"EOF";
$obj$objext: $deps
$cmd $incs $cmdflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
