Don't add write errors into bytecounts
[openssl.git] / Makefile.org
index 301b4d3..69baf48 100644 (file)
@@ -106,10 +106,6 @@ MODES_ASM_OBJ=
 ENGINES_ASM_OBJ=
 PERLASM_SCHEME=
 
-# KRB5 stuff
-KRB5_INCLUDES=
-LIBKRB5=
-
 # Zlib stuff
 ZLIB_INCLUDE=
 LIBZLIB=
@@ -146,7 +142,7 @@ SDIRS=  \
        des aes rc2 rc4 rc5 idea bf cast camellia seed modes \
        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 \
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \
        cms pqueue ts jpake srp store cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
@@ -166,9 +162,6 @@ HTMLDIR=$(OPENSSLDIR)/html
 SHELL=/bin/sh
 
 TOP=    .
-ONEDIRS=out tmp
-EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
-WDIRS=  windows
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
@@ -226,7 +219,6 @@ BUILDENV=   PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'    \
                MAKEDEPPROG='$(MAKEDEPPROG)'                    \
                SHARED_LDFLAGS='$(SHARED_LDFLAGS)'              \
-               KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'   \
                ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'     \
                EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'       \
                SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \
@@ -347,9 +339,6 @@ build-shared: do_$(SHLIB_TARGET) link-shared
 
 do_$(SHLIB_TARGET):
        @ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
-               if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \
-                       libs="$(LIBKRB5) $$libs"; \
-               fi; \
                $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
                        LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
                        LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
@@ -370,7 +359,7 @@ libcrypto.pc: Makefile
            echo 'Requires: '; \
            echo 'Libs: -L$${libdir} -lcrypto'; \
            echo 'Libs.private: $(EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
+           echo 'Cflags: -I$${includedir}' ) > libcrypto.pc
 
 libssl.pc: Makefile
        @ ( echo 'prefix=$(INSTALLTOP)'; \
@@ -384,7 +373,7 @@ libssl.pc: Makefile
            echo 'Requires.private: libcrypto'; \
            echo 'Libs: -L$${libdir} -lssl'; \
            echo 'Libs.private: $(EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+           echo 'Cflags: -I$${includedir}' ) > libssl.pc
 
 openssl.pc: Makefile
        @ ( echo 'prefix=$(INSTALLTOP)'; \
@@ -406,17 +395,13 @@ libclean:
        rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
 
 clean: libclean
-       rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+       rm -f */*/*.o */*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
        rm -rf *.bak certs/.0
        @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
        rm -f $(LIBS) tags TAGS
        rm -f openssl.pc libssl.pc libcrypto.pc
        rm -f speed.* .pure
        rm -f $(TARFILE)
-       @set -e; for i in $(ONEDIRS) ;\
-       do \
-       rm -fr $$i/*; \
-       done
 
 makefile.one: files
        $(PERL) util/mk1mf.pl >makefile.one; \
@@ -438,8 +423,8 @@ rehash.time: certs apps
        @if [ -z "$(CROSS_COMPILE)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \
                [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
-               OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONFIG=/dev/null ; \
-               export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONFIG; \
+               OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
+               export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
                $(PERL) tools/c_rehash certs/demo) && \
                touch rehash.time; \
        else :; fi