[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  8be7438f16cbd8c53206c5494a8fcbedab94bd6a (commit)
      from  ef85320622bdc264ab2741d0461fa79a4934c93f (commit)


- Log -----------------------------------------------------------------
commit 8be7438f16cbd8c53206c5494a8fcbedab94bd6a
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Sep 28 15:46:09 2015 +0200

    Rationalize .gitignore and harmonize pair of Makefiles.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore         | 24 ++++++------------------
 crypto/ec/Makefile |  2 +-
 engines/Makefile   |  2 +-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92f17c6..1f5b087 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,24 +43,11 @@
 
 # Auto generated assembly language source files
 *.s
-*.S
-!/crypto/bn/asm/pa-risc2.s
-!/crypto/bn/asm/pa-risc2W.s
-crypto/aes/asm/a_win32.asm
-crypto/bf/asm/b_win32.asm
-crypto/bn/asm/bn_win32.asm
-crypto/bn/asm/co_win32.asm
-crypto/bn/asm/mt_win32.asm
-crypto/cast/asm/c_win32.asm
-crypto/cpu_win32.asm
-crypto/des/asm/d_win32.asm
-crypto/des/asm/y_win32.asm
-crypto/md5/asm/m5_win32.asm
-crypto/rc4/asm/r4_win32.asm
-crypto/rc5/asm/r5_win32.asm
-crypto/ripemd/asm/rm_win32.asm
-crypto/sha/asm/s1_win32.asm
-crypto/sha/asm/sha512-sse2.asm
+!/crypto/*/asm/*.s
+/crypto/arm*.S
+/crypto/*/*.S
+*.asm
+!/crypto/*/asm/*.asm
 
 # Executables
 /apps/openssl
@@ -80,6 +67,7 @@ crypto/sha/asm/sha512-sse2.asm
 *.so*
 *.dylib*
 *.dll*
+*.exe
 # Exceptions
 !/test/bctest
 !/crypto/des/times/486-50.sol
diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile
index a2c135a..9ad71f6 100644
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -83,7 +83,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/engines/Makefile b/engines/Makefile
index a1ea0a6..3773e74 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -154,7 +154,7 @@ dclean:
 	@target=dclean; $(RECURSIVE_MAKE)
 
 clean:
-	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 	@target=clean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.