Rationalize .gitignore and harmonize pair of Makefiles.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/.gitignore b/.gitignore
index 92f17c603250172c24d1b7d76c38b8e55f67f638..1f5b0878b85aacd775a9e83b1bd8f632eb625ca8 100644 (file)
--- 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 a2c135a04a425a4a0588c29a63f44f01b818bf5b..9ad71f6ee1887bc54f8749786678c33159b62fb0 100644 (file)
--- 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 a1ea0a6ebf0aee1ff246eeac2209b7689bf8aa7e..3773e74c263f7807b7381b3bd374a5f44fb7f95c 100644 (file)
--- 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.