diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-13 21:41:14 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-15 08:13:37 +0200 |
| commit | 49bb4dd0499e93c43e1408ebbf0f58f357eeae38 (patch) | |
| tree | a56600b6a9dcb9a49f926b8ac88f9ee2ea6a77ef /Configurations/unix-Makefile.tmpl | |
| parent | 4442061532fb1a98c22609bf37303b77716df624 (diff) | |
Fix cygwin make dependencies
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5951)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 39df5cd184..05ab53c0ed 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; \ @@ -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 |