X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Makefile.org;h=de6d7280af3323c6b2a843bb410be4d25a886a07;hp=826dc086cc34adef184d38d0b59c0950d7327c42;hb=1334462ab3548025df4672f3d52fd5c13e25ff18;hpb=ed65fab9103c5d2f32c2c4c07ceab22687d95327 diff --git a/Makefile.org b/Makefile.org index 826dc086cc..de6d7280af 100644 --- a/Makefile.org +++ b/Makefile.org @@ -57,9 +57,8 @@ OPENSSLDIR=/usr/local/ssl # equal 4. # PKCS1_CHECK - pkcs1 tests. -CC= gcc -#CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM -CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM +CC= cc +CFLAG= -O DEPFLAG= PEX_LIBS= EX_LIBS= @@ -86,89 +85,16 @@ PROCESSOR= # CPUID module collects small commonly used assembler snippets CPUID_OBJ= - -# Set BN_ASM to bn_asm.o if you want to use the C version BN_ASM= bn_asm.o -#BN_ASM= bn_asm.o -#BN_ASM= asm/bn86-elf.o # elf, linux-elf -#BN_ASM= asm/bn86-sol.o # solaris -#BN_ASM= asm/bn86-out.o # a.out, FreeBSD -#BN_ASM= asm/bn86bsdi.o # bsdi -#BN_ASM= asm/alpha.o # DEC Alpha -#BN_ASM= asm/pa-risc2.o # HP-UX PA-RISC -#BN_ASM= asm/r3000.o # SGI MIPS cpu -#BN_ASM= asm/sparc.o # Sun solaris/SunOS -#BN_ASM= asm/bn-win32.o # Windows 95/NT -#BN_ASM= asm/x86w16.o # 16 bit code for Windows 3.1/DOS -#BN_ASM= asm/x86w32.o # 32 bit code for Windows 3.1 - -# Set DES_ENC to des_enc.o if you want to use the C version -#There are 4 x86 assember options. -DES_ENC= asm/dx86-out.o asm/yx86-out.o -#DES_ENC= des_enc.o fcrypt_b.o # C -#DES_ENC= asm/dx86-elf.o asm/yx86-elf.o # elf -#DES_ENC= asm/dx86-sol.o asm/yx86-sol.o # solaris -#DES_ENC= asm/dx86-out.o asm/yx86-out.o # a.out, FreeBSD -#DES_ENC= asm/dx86bsdi.o asm/yx86bsdi.o # bsdi - +DES_ENC= des_enc.o fcrypt_b.o AES_ASM_OBJ=aes_core.o aes_cbc.o - -# Set BF_ENC to bf_enc.o if you want to use the C version -#There are 4 x86 assember options. -BF_ENC= asm/bx86-out.o -#BF_ENC= bf_enc.o -#BF_ENC= asm/bx86-elf.o # elf -#BF_ENC= asm/bx86-sol.o # solaris -#BF_ENC= asm/bx86-out.o # a.out, FreeBSD -#BF_ENC= asm/bx86bsdi.o # bsdi - -# Set CAST_ENC to c_enc.o if you want to use the C version -#There are 4 x86 assember options. -CAST_ENC= asm/cx86-out.o -#CAST_ENC= c_enc.o -#CAST_ENC= asm/cx86-elf.o # elf -#CAST_ENC= asm/cx86-sol.o # solaris -#CAST_ENC= asm/cx86-out.o # a.out, FreeBSD -#CAST_ENC= asm/cx86bsdi.o # bsdi - -# Set RC4_ENC to rc4_enc.o if you want to use the C version -#There are 4 x86 assember options. -RC4_ENC= asm/rx86-out.o -#RC4_ENC= rc4_enc.o -#RC4_ENC= asm/rx86-elf.o # elf -#RC4_ENC= asm/rx86-sol.o # solaris -#RC4_ENC= asm/rx86-out.o # a.out, FreeBSD -#RC4_ENC= asm/rx86bsdi.o # bsdi - -# Set RC5_ENC to rc5_enc.o if you want to use the C version -#There are 4 x86 assember options. -RC5_ENC= asm/r586-out.o -#RC5_ENC= rc5_enc.o -#RC5_ENC= asm/r586-elf.o # elf -#RC5_ENC= asm/r586-sol.o # solaris -#RC5_ENC= asm/r586-out.o # a.out, FreeBSD -#RC5_ENC= asm/r586bsdi.o # bsdi - -# Also need MD5_ASM defined -MD5_ASM_OBJ= asm/mx86-out.o -#MD5_ASM_OBJ= asm/mx86-elf.o # elf -#MD5_ASM_OBJ= asm/mx86-sol.o # solaris -#MD5_ASM_OBJ= asm/mx86-out.o # a.out, FreeBSD -#MD5_ASM_OBJ= asm/mx86bsdi.o # bsdi - -# Also need SHA1_ASM defined -SHA1_ASM_OBJ= asm/sx86-out.o -#SHA1_ASM_OBJ= asm/sx86-elf.o # elf -#SHA1_ASM_OBJ= asm/sx86-sol.o # solaris -#SHA1_ASM_OBJ= asm/sx86-out.o # a.out, FreeBSD -#SHA1_ASM_OBJ= asm/sx86bsdi.o # bsdi - -# Also need RMD160_ASM defined -RMD160_ASM_OBJ= asm/rm86-out.o -#RMD160_ASM_OBJ= asm/rm86-elf.o # elf -#RMD160_ASM_OBJ= asm/rm86-sol.o # solaris -#RMD160_ASM_OBJ= asm/rm86-out.o # a.out, FreeBSD -#RMD160_ASM_OBJ= asm/rm86bsdi.o # bsdi +BF_ENC= bf_enc.o +CAST_ENC= c_enc.o +RC4_ENC= rc4_enc.o +RC5_ENC= rc5_enc.o +MD5_ASM_OBJ= +SHA1_ASM_OBJ= +RMD160_ASM_OBJ= # KRB5 stuff KRB5_INCLUDES= @@ -181,8 +107,8 @@ SHLIBDIRS= crypto ssl SDIRS= \ objects \ md2 md4 md5 sha mdc2 hmac ripemd \ - des rc2 rc4 rc5 idea bf cast \ - bn ec rsa dsa ecdsa dh ecdh dso engine aes \ + des aes rc2 rc4 rc5 idea bf cast \ + bn ec rsa dsa ecdsa dh ecdh dso engine \ buffer bio stack lhash rand err \ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ store @@ -191,9 +117,9 @@ SDIRS= \ # should be performed. TESTS = alltests -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile NEWMAKE= make -MAKE= $(NEWMAKE) -f Makefile.ssl +MAKE= $(NEWMAKE) MANDIR=$(OPENSSLDIR)/man MAN1=1 @@ -220,7 +146,7 @@ WTARFILE= $(NAME)-win.tar EXHEADER= e_os2.h HEADER= e_os.h -all: Makefile.ssl build_all openssl.pc +all: Makefile build_all openssl.pc BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' \ @@ -244,7 +170,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \ if [ -d "$$dir" ]; then \ (cd $$dir && echo "making $$target in $$dir..." && \ - $(MAKE) $(BUILDENV) $$target ) || exit 1; \ + $(MAKE) -e $(BUILDENV) $$target ) || exit 1; \ else \ $(MAKE) $$dir; \ fi; fi @@ -327,7 +253,7 @@ do_$(SHLIB_TARGET): libs="-l$$i $$libs"; \ done -openssl.pc: Makefile.ssl +openssl.pc: Makefile @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ echo 'libdir=$${exec_prefix}/lib'; \ @@ -340,8 +266,8 @@ openssl.pc: Makefile.ssl echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc -Makefile.ssl: Makefile.org - @echo "Makefile.ssl is older than Makefile.org." +Makefile: Makefile.org + @echo "Makefile is older than Makefile.org." @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." @false @@ -371,7 +297,7 @@ makefile.one: files sh util/do_ms.sh files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO @set -e; for i in $(DIRS) ;\ do \ if [ -d "$$i" ]; then \ @@ -381,7 +307,6 @@ files: done; links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) @set -e; target=links; for dir in $(DIRS); do $(BUILD_CMD); done @@ -402,20 +327,9 @@ dclean: rehash: rehash.time rehash.time: certs - @(OPENSSL="`pwd`/apps/openssl$(EXE_EXT)"; OPENSSL_DEBUG_MEMORY=on; \ + @(OPENSSL="`pwd`/util/opensslwrap.sh"; \ + OPENSSL_DEBUG_MEMORY=on; \ export OPENSSL OPENSSL_DEBUG_MEMORY; \ - if [ -n "$(SHARED_LIBS)" ]; then \ - LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ - DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ - SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ - LIBPATH="`pwd`:$$LIBPATH"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then \ - PATH="`pwd`:$$PATH"; \ - fi; \ - LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - export LD_PRELOAD; \ - fi; \ $(PERL) tools/c_rehash certs) touch rehash.time @@ -423,18 +337,8 @@ test: tests tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); - @if [ -n "$(SHARED_LIBS)" ]; then \ - LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ - DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ - SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ - LIBPATH="`pwd`:$$LIBPATH"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ - LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - export LD_PRELOAD; \ - fi; \ - apps/openssl version -a + $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); + util/opensslwrap.sh version -a report: @$(PERL) util/selftest.pl @@ -458,13 +362,8 @@ lint: done; tags: - @set -e; for i in $(DIRS) ;\ - do \ - if [ -d "$$i" ]; then \ - (cd $$i && echo "making tags $$i..." && \ - $(MAKE) SDIRS='${SDIRS}' tags ) || exit 1; \ - fi; \ - done; + rm -f TAGS + find . -name '[^.]*.[ch]' | xargs etags -a errors: $(PERL) util/mkerr.pl -recurse -write