The pointer to the cipher object is not yet set, when session was reloaded
[openssl.git] / Makefile.org
index cdeaae6..c32c1ae 100644 (file)
@@ -156,11 +156,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o
 KRB5_INCLUDES=
 LIBKRB5=
 
-# When we're prepared to use shared libraries in the programs we link here
-# we might set SHLIB_MARK to '$(SHARED_LIBS)'.
-SHLIB_MARK=
-
-DIRS=   crypto ssl $(SHLIB_MARK) apps test tools
+DIRS=   crypto ssl engines apps test tools
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
@@ -176,7 +172,8 @@ SDIRS=  \
 TESTS = alltests
 
 MAKEFILE= Makefile.ssl
-MAKE=     make -f Makefile.ssl
+NEWMAKE=  make
+MAKE=     $(NEWMAKE) -f Makefile.ssl
 
 MANDIR=$(OPENSSLDIR)/man
 MAN1=1
@@ -202,21 +199,33 @@ WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
-# When we're prepared to use shared libraries in the programs we link here
-# we might remove 'clean-shared' from the targets to perform at this stage
-
-all: Makefile.ssl sub_all
+all: Makefile.ssl build_all openssl.pc
 
-sub_all:
-       @for i in $(DIRS); \
-       do \
+BUILD_CMD=if echo " $(DIRS) " | grep " $$i " >/dev/null 2>/dev/null; then \
        if [ -d "$$i" ]; then \
                (cd $$i && echo "making all in $$i..." && \
                $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \
        else \
                $(MAKE) $$i; \
-       fi; \
-       done;
+       fi; fi
+
+sub_all: build_all
+build_all: build_libs build_apps build_tests build_tools
+
+build_libs: build_crypto build_ssl build_engines
+
+build_crypto:
+       @i=crypto; $(BUILD_CMD)
+build_ssl:
+       @i=ssl; $(BUILD_CMD)
+build_engines:
+       @i=engines; $(BUILD_CMD)
+build_apps:
+       @i=apps; $(BUILD_CMD)
+build_tests:
+       @i=test; $(BUILD_CMD)
+build_tools:
+       @i=tools; $(BUILD_CMD)
 
 libcrypto$(SHLIB_EXT): libcrypto.a
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -247,272 +256,40 @@ clean-shared:
        done
 
 link-shared:
-       @if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
-               tmp="$(SHARED_LIBS_LINK_EXTS)"; \
-               for i in $(SHLIBDIRS); do \
-                       prev=lib$$i$(SHLIB_EXT); \
-                       for j in $${tmp:-x}; do \
-                               ( set -x; \
-                               rm -f lib$$i$$j; ln -s $$prev lib$$i$$j ); \
-                               prev=lib$$i$$j; \
-                       done; \
-               done; \
-       fi
-
-build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
-
-do_bsd-gcc-shared: do_gnu-shared
-do_linux-shared: do_gnu-shared
-do_gnu-shared:
-       libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x; ${CC} ${SHARED_LDFLAGS} \
-               -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               -Wl,-Bsymbolic \
-               -Wl,--whole-archive lib$$i.a \
-               -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
-       libs="$$libs -l$$i"; \
-       done
-
-DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \
-       my_ld=`gcc -print-prog-name=ld 2>&1` && \
-       [ -n "$$my_ld" ] && \
-       $$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1
-
-# For Darwin AKA Mac OS/X (dyld)
-do_darwin-shared: 
-       libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x ; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
-               lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
-               -install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
-       libs="$$libs -l`basename $$i${SHLIB_EXT} .dylib`"; \
-       echo "" ; \
-       done
-
-do_cygwin-shared:
-       libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x; ${CC}  -shared -o cyg$$i.dll \
-               -Wl,-Bsymbolic \
-               -Wl,--whole-archive lib$$i.a \
-               -Wl,--out-implib,lib$$i.dll.a \
-               -Wl,--no-whole-archive $$libs ) || exit 1; \
-       libs="$$libs -l$$i"; \
-       done
-
-# This assumes that GNU utilities are *not* used
-do_alpha-osf1-shared:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( set -x; ${CC} ${SHARED_LDFLAGS} \
-                       -shared -o lib$$i.so \
-                       -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
-                       -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \
-               libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-# This assumes that GNU utilities are *not* used
-# The difference between alpha-osf1-shared and tru64-shared is the `-msym'
-# option passed to the linker.
-do_tru64-shared:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( set -x; ${CC} ${SHARED_LDFLAGS} \
-                       -shared -msym -o lib$$i.so \
-                       -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
-                       -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \
+       @ for i in ${SHLIBDIRS}; do \
+               $(NEWMAKE) -f Makefile.shared \
+                       LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
+                       LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
+                       symlink.$(SHLIB_TARGET); \
                libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-# This assumes that GNU utilities are *not* used
-# The difference between tru64-shared and tru64-shared-rpath is the
-# -rpath ${INSTALLTOP}/lib passed to the linker.
-do_tru64-shared-rpath:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( set -x; ${CC} ${SHARED_LDFLAGS} \
-                       -shared -msym -o lib$$i.so \
-                       -rpath  ${INSTALLTOP}/lib \
-                       -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
-                       -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \
-               libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-
-# This assumes that GNU utilities are *not* used
-do_solaris-shared:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
-                 set -x; ${CC} ${SHARED_LDFLAGS} \
-                       -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       -z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
-               libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-# OpenServer 5 native compilers used
-do_svr3-shared:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
-                 find . -name "*.o" -print > allobjs ; \
-                 OBJS= ; export OBJS ; \
-                 for obj in `ar t lib$$i.a` ; do \
-                   OBJS="$${OBJS} `grep $$obj allobjs`" ; \
-                 done ; \
-                 set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \
-               libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-# UnixWare 7 and OpenUNIX 8 native compilers used
-do_svr5-shared:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
-                 find . -name "*.o" -print > allobjs ; \
-                 OBJS= ; export OBJS ; \
-                 for obj in `ar t lib$$i.a` ; do \
-                   OBJS="$${OBJS} `grep $$obj allobjs`" ; \
-                 done ; \
-                 set -x; ${CC} ${SHARED_LDFLAGS} \
-                       -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \
-               libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-# This assumes that GNU utilities are *not* used
-do_irix-shared:
-       if ${DETECT_GNU_LD}; then \
-               $(MAKE) do_gnu-shared; \
-       else \
-               libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-               ( set -x; ${CC} ${SHARED_LDFLAGS} \
-                       -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       -Wl,-soname,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                       -all lib$$i.a $$libs ${EX_LIBS} -lc) || exit 1; \
-               libs="$$libs -l$$i"; \
-               done; \
-       fi
-
-# This assumes that GNU utilities are *not* used
-# HP-UX includes the full pathname of libs we depend on, so we would get
-# ./libcrypto (with ./ as path information) compiled into libssl, hence
-# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto
-# anyway.
-# The object modules are loaded from lib$i.a using the undocumented -Fl
-# option.
-#
-# WARNING: Until DSO is fixed to support a search path, we support SHLIB_PATH
-#          by temporarily specifying "+s"!
-#
-do_hpux-shared:
-       for i in ${SHLIBDIRS}; do \
-       ( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \
-               +vnocompatwarnings \
-               -b -z +s \
-               -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               -Fl lib$$i.a -ldld -lc ) || exit 1; \
-       chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
        done
 
-# This assumes that GNU utilities are *not* used
-# HP-UX includes the full pathname of libs we depend on, so we would get
-# ./libcrypto (with ./ as path information) compiled into libssl, hence
-# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto
-# anyway.
-#
-# HP-UX in 64bit mode has "+s" enabled by default; it will search for
-# shared libraries along LD_LIBRARY_PATH _and_ SHLIB_PATH.
-#
-do_hpux64-shared:
-       for i in ${SHLIBDIRS}; do \
-       ( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \
-               -b -z \
-               -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               +forceload lib$$i.a -ldl -lc ) || exit 1; \
-       chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
-       done
-
-# The following method is said to work on all platforms.  Tests will
-# determine if that's how it's gong to be used.
-# This assumes that for all but GNU systems, GNU utilities are *not* used.
-# ALLSYMSFLAGS would be:
-#  GNU systems: --whole-archive
-#  Tru64 Unix:  -all
-#  Solaris:     -z allextract
-#  Irix:        -all
-#  HP/UX-32bit: -Fl
-#  HP/UX-64bit: +forceload
-#  AIX:                -bnogc
-# SHAREDFLAGS would be:
-#  GNU systems: -shared -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-#  Tru64 Unix:  -shared \
-#              -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
-#  Solaris:     -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-#  Irix:        -shared -Wl,-soname,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-#  HP/UX-32bit: +vnocompatwarnings -b -z +s \
-#              +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR}
-#  HP/UX-64bit: -b -z +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR}
-#  AIX:                -G -bE:lib$$i.exp -bM:SRE
-# SHAREDCMD would be:
-#  GNU systems: $(CC)
-#  Tru64 Unix:  $(CC)
-#  Solaris:     $(CC)
-#  Irix:        $(CC)
-#  HP/UX-32bit: /usr/ccs/bin/ld
-#  HP/UX-64bit: /usr/ccs/bin/ld
-#  AIX:                $(CC)
-ALLSYMSFLAG=-bnogc
-SHAREDFLAGS=${SHARED_LDFLAGS} -G -bE:lib$$i.exp -bM:SRE
-SHAREDCMD=$(CC)
-do_aix-shared:
-       libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x; \
-         ld -r -o $$i.o $(ALLSYMSFLAG) lib$$i.a && \
-         ( nm -Pg lib$$i.o | grep ' [BD] ' | cut -f1 -d' ' > lib$$i.exp; \
-           $(SHAREDCMD) $(SHAREDFLAG) -o lib$$i.so lib$$i.o \
-               $$libs ${EX_LIBS} ) ) \
-       || exit 1; \
-       libs="$$libs -l$$i"; \
+build-shared: do_$(SHLIB_TARGET) link-shared
+
+do_$(SHLIB_TARGET):
+       @ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
+               $(NEWMAKE) -f Makefile.shared \
+                       CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
+                       SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+                       LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
+                       LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
+                       LIBDEPS="$$libs $(EX_LIBS)" \
+                       link_a.$(SHLIB_TARGET); \
+               libs="$$libs -l$$i"; \
        done
 
-do_reliantunix-shared:
-       libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       tmpdir=/tmp/openssl.$$$$ ; rm -rf $$tmpdir ; \
-       ( set -x; \
-         ( Opwd=`pwd` ; mkdir $$tmpdir || exit 1; \
-           cd $$tmpdir || exit 1 ; ar x $$Opwd/lib$$i.a ; \
-           ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} *.o \
-         ) || exit 1; \
-         cp $$tmpdir/lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} . ; \
-       ) || exit 1; \
-       rm -rf $$tmpdir ; \
-       libs="$$libs -l$$i"; \
-       done
+openssl.pc:
+       @ ( echo 'prefix=$(INSTALLTOP)'; \
+           echo 'exec_prefix=$${prefix}'; \
+           echo 'libdir=$${exec_prefix}/lib'; \
+           echo 'includedir=$${prefix}/include'; \
+           echo ''; \
+           echo 'Name: OpenSSL'; \
+           echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+           echo 'Version: '$(VERSION); \
+           echo 'Requires: '; \
+           echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+           echo 'Cflags: -I$${includedir}' ) > openssl.pc
 
 Makefile.ssl: Makefile.org
        @echo "Makefile.ssl is older than Makefile.org."
@@ -520,7 +297,7 @@ Makefile.ssl: Makefile.org
        @false
 
 libclean:
-       rm -f *.a */lib */*/lib
+       rm -f *.so *.so.* engines/*.so *.a */lib */*/lib
 
 clean:
        rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c
@@ -532,6 +309,7 @@ clean:
                rm -f $(LIBS); \
        fi; \
        done;
+       rm -f openssl.pc
        rm -f *.a *.o speed.* *.map *.so .pure core
        rm -f $(TARFILE)
        @for i in $(ONEDIRS) ;\
@@ -628,7 +406,7 @@ tags:
 
 errors:
        $(PERL) util/mkerr.pl -recurse -write
-       (cd crypto/engine; $(MAKE) PERL=$(PERL) errors)
+       (cd engines; $(MAKE) PERL=$(PERL) errors)
 
 stacks:
        $(PERL) util/mkstack.pl -write
@@ -656,6 +434,9 @@ update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
 tar:
+       find . -type d -print | xargs chmod 755
+       find . -type f -print | xargs chmod a+r
+       find . -type f -perm -0100 -print | xargs chmod a+x
        find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
        $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
        tardy --user_number=0  --user_name=openssl \
@@ -685,7 +466,9 @@ dist_pem_h:
 install: all install_docs
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
                $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkginfo \
                $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/engines \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/private \
@@ -699,7 +482,7 @@ install: all install_docs
        do \
        if [ -d "$$i" ]; then \
                (cd $$i; echo "installing $$i..."; \
-               $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' EXE_EXT='${EXE_EXT}' install ); \
+               $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' install ); \
        fi; \
        done
        @for i in $(LIBS) ;\
@@ -735,9 +518,9 @@ install: all install_docs
                done; \
                (       here="`pwd`"; \
                        cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-                       set $(MAKE); \
-                       $$1 -f $$here/Makefile link-shared ); \
+                       $(NEWMAKE) -f $$here/Makefile link-shared ); \
        fi
+       cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkginfo
 
 install_docs:
        @$(PERL) $(TOP)/util/mkdir-p.pl \