Complete integration of SPARC assembler DES implementation. Tested on Solaris

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index a3ae233aca27ddc88b112f03fb7d57968e3bedc5..ec602faa7dfeb04b76bb5610a0dd1dd4fa15e00b 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -159,7 +159,6 @@ RMD160_ASM_OBJ= asm/rm86-out.o
 
 # KRB5 stuff
 KRB5_INCLUDES=
-LIBKRB5=
 
 DIRS=   crypto ssl engines apps test tools
 SHLIBDIRS= crypto ssl
@@ -283,7 +282,7 @@ do_$(SHLIB_TARGET):
                libs="$$libs -l$$i"; \
        done
 
-openssl.pc:
+openssl.pc: Makefile.ssl
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \
            echo 'libdir=$${exec_prefix}/lib'; \
@@ -294,7 +293,7 @@ openssl.pc:
            echo 'Version: '$(VERSION); \
            echo 'Requires: '; \
            echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir}' ) > openssl.pc
+           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 
 Makefile.ssl: Makefile.org
        @echo "Makefile.ssl is older than Makefile.org."
@@ -367,7 +366,7 @@ rehash.time: certs
                export OPENSSL OPENSSL_DEBUG_MEMORY; \
                LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
                if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-               elif [ "$(PLATFORM)" != "Cygwin" ];  then PATH="`pwd`:$$PATH"; fi; \
+               elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
                export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
                $(PERL) tools/c_rehash certs)
        touch rehash.time
@@ -379,7 +378,7 @@ tests: rehash
        $(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}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
        @LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
                if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-               elif [ "$(PLATFORM)" != "Cygwin" ];  then PATH="`pwd`:$$PATH"; fi; \
+               elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
                export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
                apps/openssl version -a
 
@@ -475,7 +474,7 @@ 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)/lib/pkgconfig \
                $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/engines \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
@@ -529,7 +528,7 @@ install: all install_docs
                        cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
                        $(NEWMAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
        fi
-       cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkginfo
+       cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
 
 install_docs:
        @$(PERL) $(TOP)/util/mkdir-p.pl \
@@ -538,6 +537,11 @@ install_docs:
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
        @pod2man="`cd util; ./pod2mantest $(PERL)`"; \
+       here="`pwd`"; \
+       filecase=; \
+       if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" ]; then \
+               filecase=-i; \
+       fi; \
        for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
@@ -547,10 +551,12 @@ install_docs:
                        --section=$$sec --center=OpenSSL \
                        --release=$(VERSION) `basename $$i`") \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \
-               $(PERL) util/extract-names.pl < $$i | grep -v "^$$fn" | \
-                       while read n; do \
-                               util/point.sh $$fn.$$sec $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$n.$$sec; \
-                       done; \
+               $(PERL) util/extract-names.pl < $$i | \
+                       grep -v $$filecase "^$$fn\$$" | \
+                       (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+                        while read n; do \
+                               $$here/util/point.sh $$fn.$$sec $$n.$$sec; \
+                        done); \
        done; \
        for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
@@ -561,10 +567,12 @@ install_docs:
                        --section=$$sec --center=OpenSSL \
                        --release=$(VERSION) `basename $$i`") \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \
-               $(PERL) util/extract-names.pl < $$i | grep -v "^$$fn" | \
-                       while read n; do \
-                               util/point.sh $$fn.$$sec $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$n.$$sec; \
-                       done; \
+               $(PERL) util/extract-names.pl < $$i | \
+                       grep -v $$filecase "^$$fn\$$" | \
+                       (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+                        while read n; do \
+                               $$here/util/point.sh $$fn.$$sec $$n.$$sec; \
+                        done); \
        done
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.