The branch master has been updated
via 4c1cf7e4400daa47fd18c6321edb78fac636a994 (commit)
from f425f9dcffc4efa13fbdbba34c6883b038409f3f (commit)
- Log -----------------------------------------------------------------
commit 4c1cf7e4400daa47fd18c6321edb78fac636a994
Author: Richard Levitte <[email protected]>
Date: Sat Mar 12 12:42:49 2016 +0100
Collect the names of generated files and clean them away at target clean:
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 522d80f..e9288dc 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -84,6 +84,7 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
keys %{$unified_info{sources}}); -}
{- output_on() if $disabled{makedepend}; "" -}
+GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys
%{$unified_info{generate}}) -}
BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash
MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \
@@ -242,13 +243,14 @@ install: install_sw install_ssldirs install_docs
uninstall: uninstall_docs uninstall_sw
clean: libclean
- rm -f $(PROGRAMS) $(TESTPROGS)
- rm -f `find $(BLDDIR) -name '*{- $depext -}'`
- rm -f `find $(BLDDIR) -name '*{- $objext -}'`
- rm -f $(BLDDIR)/core
- rm -f $(BLDDIR)/tags $(BLDDIR)/TAGS
- rm -f $(BLDDIR)/openssl.pc $(BLDDIR)/libcrypto.pc $(BLDDIR)/libssl.pc
- -rm -f `find $(BLDDIR) -type l`
+ rm -f $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
+ rm -f $(GENERATED)
+ -rm -f `find . -name '*{- $depext -}'`
+ -rm -f `find . -name '*{- $objext -}'`
+ rm -f core
+ rm -f tags TAGS
+ rm -f openssl.pc libcrypto.pc libssl.pc
+ -rm -f `find . -type l`
rm -f $(TARFILE)
# This exists solely for those who still type 'make depend'
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
