X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fbn%2FMakefile.ssl;h=d5071b9f47f8b8e39091bda10fb17fcfabd2556c;hp=a88916e1e29e91245309c1da89d97064d62693c5;hb=52c4409240509ad06b6287055d06ab0aecf5288e;hpb=bf57da0717c4de574fed76bd08d5504a8b57cae3

diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index a88916e1e2..d5071b9f47 100644
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -7,6 +7,8 @@ TOP=	../..
 CC=	cc
 INCLUDES= -I.. -I../../include
 CFLAG=-g
+INSTALL_PREFIX=
+OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=		make -f Makefile.ssl
 MAKEDEPEND=	$(TOP)/util/domd $(TOP)
@@ -19,8 +21,6 @@ BN_ASM=		bn_asm.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-ERR=bn
-ERRC=bn_err
 GENERAL=Makefile
 TEST=bntest.c exptest.c
 APPS=
@@ -28,12 +28,12 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c \
 	bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
-	bn_gcd.c bn_prime.c $(ERRC).c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c \
+	bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c \
 	bn_mpi.c bn_exp2.c
 
 LIBOBJ=	bn_add.o bn_div.o bn_exp.o bn_lib.o bn_mul.o \
 	bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \
-	bn_gcd.o bn_prime.o $(ERRC).o bn_sqr.o $(BN_ASM) bn_recp.o bn_mont.o \
+	bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) bn_recp.o bn_mont.o \
 	bn_mpi.o bn_exp2.o
 
 SRC= $(LIBSRC)
@@ -99,7 +99,12 @@ asm/co86unix.cpp: asm/co-586.pl
 	(cd asm; $(PERL) co-586.pl cpp >co86unix.cpp )
 
 asm/sparcv8.o: asm/sparcv8.S
-	$(CC) -c -o asm/sparcv8.o asm/sparcv8.S
+
+asm/sparcv8plus.o: asm/sparcv8plus.S
+	$(CC) -xarch=v8plus -c asm/sparcv8plus.S -o asm/sparcv8plus.o
+
+asm/sparcv8plus-gcc.o: asm/sparcv8plus.S
+	gcc -E asm/sparcv8plus.S | as -xarch=v8plus /dev/fd/0 -o asm/sparcv8plus-gcc.o
 
 # MIPS 64 bit assember 
 asm/mips3.o: asm/mips3.s
@@ -114,15 +119,15 @@ files:
 
 links:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
-	@$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER)
-	@$(TOP)/util/mklink.sh ../../test $(TEST)
-	@$(TOP)/util/mklink.sh ../../apps $(APPS)
+	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
 	do  \
-	(cp $$i $(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
+	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 	done;
 
 exptest:
@@ -142,7 +147,7 @@ lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-	$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
 
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
@@ -151,12 +156,6 @@ dclean:
 clean:
 	rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s
 
-errors: $(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
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 bn_add.o: ../../include/openssl/bio.h ../../include/openssl/bn.h