From baa2cd83b5b87669b6f53b0596e521cd3a670b61 Mon Sep 17 00:00:00 2001 From: magnum Date: Tue, 15 Nov 2011 11:29:49 +0100 Subject: [PATCH 22/23] j8: Shorten Makefile target list --- src/Makefile | 39 ++++++++++++++------------------------- 1 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/Makefile b/src/Makefile index 0f5fb76..df6a84c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -136,18 +136,16 @@ default: @echo "To build John the Ripper, type:" @echo " make clean SYSTEM" @echo "where SYSTEM can be one of the following:" - @echo "linux-x86-64i Linux, x86-64 with pre-built intrinsics (best)" - @echo "linux-x86-64 Linux, x86-64 with SSE2" + @echo "([i] is an optional letter for pre-built intrinsics, eg. -sse2i vs -sse2):" + @echo "linux-x86-64[i] Linux, x86-64 with SSE2" @echo "linux-x86-64-avx Linux, x86-64 with AVX (experimental)" @echo "linux-x86-64-xop Linux, x86-64 with AVX and XOP (experimental)" @echo "linux-x86-64-icc Linux, x86-64 compiled with icc" @echo "linux-x86-64-clang Linux, x86-64 compiled with clang" -# @echo "linux-x86-64-32-sse2i Linux, x86-64, 32-bit with pre-built intrinsics (for regression tests)" -# @echo "linux-x86-64-32-sse2 Linux, x86-64, 32-bit with SSE2 (for regression tests)" +# @echo "linux-x86-64-32-sse2[i] Linux, x86-64, 32-bit with SSE2 (for regression tests)" # @echo "linux-x86-64-32-mmx Linux, x86-64, 32-bit with MMX (for regression tests)" # @echo "linux-x86-64-32-any Linux, x86-64, 32-bit (for regression tests)" - @echo "linux-x86-sse2i Linux, x86 32-bit with pre-built intrinsics (best)" - @echo "linux-x86-sse2 Linux, x86 32-bit with SSE2" + @echo "linux-x86-sse2[i] Linux, x86 32-bit with SSE2 (best if 32-bit)" @echo "linux-x86-mmx Linux, x86 32-bit with MMX (for old computers)" @echo "linux-x86-any Linux, x86 32-bit (for truly ancient computers)" @echo "linux-x86-avx Linux, x86 32-bit with AVX (experimental)" @@ -159,17 +157,13 @@ default: # @echo "linux-ppc64-altivec Linux, PowerPC 64-bit w/AltiVec" @echo "linux-ppc64 Linux, PowerPC 64-bit" @echo "linux-ia64 Linux, IA-64" - @echo "freebsd-x86-64i FreeBSD, x86-64 with pre-built intrinsics (best)" - @echo "freebsd-x86-64 FreeBSD, x86-64 with SSE2" - @echo "freebsd-x86-sse2i FreeBSD, x86 with pre-built intrinsics (best if 32-bit)" - @echo "freebsd-x86-sse2 FreeBSD, x86 with SSE2" + @echo "freebsd-x86-64[i] FreeBSD, x86-64 with SSE2 (best)" + @echo "freebsd-x86-sse2[i] FreeBSD, x86 with SSE2 (best if 32-bit)" @echo "freebsd-x86-mmx FreeBSD, x86 with MMX" @echo "freebsd-x86-any FreeBSD, x86" @echo "freebsd-alpha FreeBSD, Alpha" - @echo "openbsd-x86-64i OpenBSD, x86-64 with pre-built intrinsics (best)" - @echo "openbsd-x86-64 OpenBSD, x86-64 with SSE2" - @echo "openbsd-x86-sse2i OpenBSD, x86 with pre-built intrinsics (best if 32-bit)" - @echo "openbsd-x86-sse2 OpenBSD, x86 with SSE2" + @echo "openbsd-x86-64[i] OpenBSD, x86-64 with SSE2 (best)" + @echo "openbsd-x86-sse2[i] OpenBSD, x86 with SSE2 (best if 32-bit)" @echo "openbsd-x86-mmx OpenBSD, x86 with MMX" @echo "openbsd-x86-any OpenBSD, x86" @echo "openbsd-alpha OpenBSD, Alpha" @@ -187,11 +181,9 @@ default: @echo "solaris-sparcv8-cc Solaris, SPARC V8 32-bit, cc" @echo "solaris-sparc-gcc Solaris, SPARC 32-bit, gcc" @echo "solaris-x86-64-cc Solaris, x86-64 with SSE2, cc" - @echo "solaris-x86-64i-gcc Solaris, x86-64 with pre-built instrinsics, gcc" - @echo "solaris-x86-64-gcc Solaris, x86-64 with SSE2, gcc" + @echo "solaris-x86-64[i]-gcc Solaris, x86-64 with SSE2, gcc" @echo "solaris-x86-sse2-cc Solaris 9 4/04+, x86 with SSE2, cc" - @echo "solaris-x86-sse2i-gcc Solaris 9 4/04+, x86 with pre-built instrinsics, gcc" - @echo "solaris-x86-sse2-gcc Solaris 9 4/04+, x86 with SSE2, gcc" + @echo "solaris-x86-sse2[i]-gcc Solaris 9 4/04+, x86 with SSE2, gcc" @echo "solaris-x86-mmx-cc Solaris, x86 with MMX, cc" @echo "solaris-x86-mmx-gcc Solaris, x86 with MMX, gcc" @echo "solaris-x86-any-cc Solaris, x86, cc" @@ -200,10 +192,8 @@ default: @echo "sco-x86-any-cc SCO, x86, cc" @echo "tru64-alpha Tru64 (Digital UNIX, OSF/1), Alpha" @echo "aix-ppc32 AIX, PowerPC 32-bit" - @echo "macosx-x86-64i Mac OS X 10.5+, Xcode 3.0+, x86-64 with pre-built instrinsics (best)" - @echo "macosx-x86-64 Mac OS X 10.5+, Xcode 3.0+, x86-64 with SSE2" - @echo "macosx-x86-sse2i Mac OS X, x86 with pre-built instrinsics" - @echo "macosx-x86-sse2 Mac OS X, x86 with SSE2" + @echo "macosx-x86-64[i] Mac OS X 10.5+, Xcode 3.0+, x86-64 with SSE2 (best)" + @echo "macosx-x86-sse2[i] Mac OS X, x86 with SSE2" @echo "macosx-ppc32-altivec Mac OS X, PowerPC w/AltiVec (best)" @echo "macosx-ppc32 Mac OS X, PowerPC 32-bit" # @echo "macosx-ppc64-altivec Mac OS X, PowerPC 64-bit w/AltiVec" @@ -216,11 +206,10 @@ default: @echo "irix-mips32 IRIX, MIPS 32-bit" @echo "dos-djgpp-x86-mmx DOS, DJGPP, x86 with MMX" @echo "dos-djgpp-x86-any DOS, DJGPP, x86" - @echo "win32-cygwin-x86-sse2i Win32, Cygwin, x86 with pre-built intrinsics (best)" + @echo "win32-cygwin-x86-sse2[i] Win32, Cygwin, x86 with SSE2 (best)" @echo "win32-cygwin-x86-mmx Win32, Cygwin, x86 with MMX" @echo "win32-cygwin-x86-any Win32, Cygwin, x86" - @echo "win32-mingw-x86-sse2i Win32, MinGW, x86 with pre-built intrinsics (best)" - @echo "win32-mingw-x86-sse2 Win32, MinGW, x86 with SSE2" + @echo "win32-mingw-x86-sse2[i] Win32, MinGW, x86 with SSE2 (best)" @echo "win32-mingw-x86-mmx Win32, MinGW, x86 with MMX" @echo "win32-mingw-x86-any Win32, MinGW, x86" @echo "beos-x86-sse2 BeOS, x86 with SSE2 (best)" -- 1.7.5.4