From 8be7438f16cbd8c53206c5494a8fcbedab94bd6a Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 28 Sep 2015 15:46:09 +0200 Subject: [PATCH] Rationalize .gitignore and harmonize pair of Makefiles. Reviewed-by: Rich Salz --- .gitignore | 24 ++++++------------------ crypto/ec/Makefile | 2 +- engines/Makefile | 2 +- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 92f17c6032..1f5b0878b8 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 a2c135a04a..9ad71f6ee1 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 a1ea0a6ebf..3773e74c26 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. -- 2.34.1