X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2FMakefile.ssl;h=612241536381f4c45b57a37d13423e31c7faed1d;hp=1253286a8036c87ee5231f9c7f2f7d3d327ed509;hb=6e6acfd4b92b089661096617de0230c07254c7fa;hpb=834eeef995bb3783550d11186f9d649aaacd43ac diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 1253286a80..6122415363 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -12,16 +12,14 @@ INSTALLTOP= /usr/local/ssl MAKE= make -f Makefile.ssl MAKEDEPEND= $(TOP)/util/domd $(TOP) MAKEFILE= Makefile.ssl -RM= /bin/rm -f +RM= rm -f AR= ar r PEX_LIBS= EX_LIBS= -CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS=" \"$(CC) $(CFLAG)\" " -DPLATFORM=" \"$(PLATFORM)\" " +CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS="\"$(CC) $(CFLAG)\"" -DPLATFORM="\"$(PLATFORM)\"" -ERR=crypto -ERRC=cpt_err LIBS= @@ -29,18 +27,17 @@ SDIRS= md2 md5 sha mdc2 hmac ripemd \ des rc2 rc4 rc5 idea bf cast \ bn rsa dsa dh \ buffer bio stack lhash rand err objects \ - evp pem x509 x509v3 \ - asn1 conf txt_db pkcs7 comp + evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp GENERAL=Makefile README LIB= $(TOP)/libcrypto.a -LIBSRC= cryptlib.c mem.c cversion.c ex_data.c tmdiff.c $(ERRC).c -LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o +LIBSRC= cryptlib.c mem.c cversion.c ex_data.c tmdiff.c cpt_err.c +LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o cpt_err.o SRC= $(LIBSRC) -EXHEADER= crypto.h cryptall.h tmdiff.h +EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h HEADER= cryptlib.h date.h $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) @@ -51,125 +48,123 @@ top: all: date.h lib subdirs date.h: ../Makefile.ssl - echo "#define DATE \"`date`\"" >date.h + echo "#define DATE \"`date`\"" >date.h subdirs: @for i in $(SDIRS) ;\ do \ - (cd $$i && echo "making all in $$i..." && \ - $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' all ) || exit 1; \ + (cd $$i && echo "making all in crypto/$$i..." && \ + $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ done; files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making 'files' in $$i..."; \ + (cd $$i; echo "making 'files' in crypto/$$i..."; \ $(MAKE) files ); \ done; links: - /bin/rm -f Makefile - $(TOP)/util/point.sh Makefile.ssl Makefile - $(TOP)/util/mklink.sh ../include $(HEADER) - $(TOP)/util/mklink.sh ../test $(TEST) - $(TOP)/util/mklink.sh ../apps $(APPS) - $(TOP)/util/point.sh Makefile.ssl Makefile - @for i in $(SDIRS) ;\ - do \ - (cd $$i; echo "making links in $$i..."; \ - $(MAKE) links ); \ + @$(TOP)/util/point.sh Makefile.ssl Makefile + @$(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) + @$(TOP)/util/mklink.pl ../test $(TEST) + @$(TOP)/util/mklink.pl ../apps $(APPS) + @$(TOP)/util/point.sh Makefile.ssl Makefile + @for i in $(SDIRS); do \ + (cd $$i; echo "making links in crypto/$$i..."; \ + $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' links ); \ done; lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib libs: @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making libs in $$i..."; \ + (cd $$i; echo "making libs in crypto/$$i..."; \ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \ done; tests: @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making tests in $$i..."; \ + (cd $$i; echo "making tests in crypto/$$i..."; \ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \ done; install: @for i in $(EXHEADER) ;\ do \ - (cp $$i $(INSTALLTOP)/include/$$i; \ - chmod 644 $(INSTALLTOP)/include/$$i ); \ + (cp $$i $(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \ done; @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making install in $$i..."; \ + (cd $$i; echo "making install in crypto/$$i..."; \ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \ done; lint: @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making lint in $$i..."; \ + (cd $$i; echo "making lint in crypto/$$i..."; \ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \ done; depend: - $(MAKEDEPEND) $(INCLUDE) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC) @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making depend in $$i..."; \ - $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' depend ); \ + (cd $$i; echo "making depend in crypto/$$i..."; \ + $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \ done; clean: - /bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making clean in $$i..."; \ + (cd $$i; echo "making clean in crypto/$$i..."; \ $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \ done; dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) @for i in $(SDIRS) ;\ do \ - (cd $$i; echo "making dclean in $$i..."; \ - $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \ + (cd $$i; echo "making dclean in crypto/$$i..."; \ + $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \ done; -errors: errgen $(ERRC).c - -$(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl err/err_genc.pl -s $(ERR).h $(ERRC).c - -errgen: - perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c - @for i in $(SDIRS) ;\ - do \ - (cd $$i; echo "making errors in $$i..."; \ - $(MAKE) errors ); \ - done; - - # DO NOT DELETE THIS LINE -- make depend depends on it. -cpt_err.o: ../include/err.h ../include/stack.h crypto.h -cryptlib.o: ../include/bio.h ../include/buffer.h ../include/e_os.h -cryptlib.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h -cversion.o: ../include/bio.h ../include/buffer.h ../include/e_os.h -cversion.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h -ex_data.o: ../include/bio.h ../include/buffer.h ../include/e_os.h -ex_data.o: ../include/err.h ../include/lhash.h ../include/stack.h cryptlib.h -ex_data.o: crypto.h -mem.o: ../include/bio.h ../include/buffer.h ../include/e_os.h ../include/err.h -mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h -tmdiff.o: ../include/bio.h ../include/buffer.h ../include/e_os.h -tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h tmdiff.h +cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h +cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/stack.h +cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h +cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h +cryptlib.o: ../include/openssl/err.h ../include/openssl/opensslconf.h +cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h +cryptlib.o: date.h +cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h +cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h +cversion.o: ../include/openssl/err.h ../include/openssl/opensslconf.h +cversion.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h +cversion.o: date.h +ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h +ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h +ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h +ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ex_data.o: ../include/openssl/stack.h cryptlib.h +mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h +mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h +mem.o: ../include/openssl/err.h ../include/openssl/lhash.h +mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +mem.o: ../include/openssl/stack.h cryptlib.h +tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h +tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h +tmdiff.o: ../include/openssl/err.h ../include/openssl/opensslconf.h +tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/stack.h +tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h