X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=rsaref%2FMakefile.ssl;h=a45b4939a6aa6d5c05691696e17ebf708122bc22;hp=b22a731fc9055bfceafab4d572433115f6f33947;hb=c76b0f751f83762d470f3be0c9c3c108465a0ace;hpb=8039257dbcd1d2e96e1d57b607b49cdf0ae78636

diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl
index b22a731fc9..a45b4939a6 100644
--- a/rsaref/Makefile.ssl
+++ b/rsaref/Makefile.ssl
@@ -15,7 +15,6 @@ AR=		ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-ERR=rsaref
 ERRC=rsar_err
 GENERAL=Makefile
 TEST=
@@ -39,25 +38,24 @@ all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
-	sh $(TOP)/util/ranlib.sh $(LIB)
+	$(RANLIB) $(LIB)
 	@touch lib
 
 files:
-	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-	/bin/rm -f Makefile
-	$(TOP)/util/point.sh Makefile.ssl Makefile ;
-	$(TOP)/util/mklink.sh ../include $(EXHEADER)
-	$(TOP)/util/mklink.sh ../test $(TEST)
-	$(TOP)/util/mklink.sh ../apps $(APPS)
+	@$(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)
 
 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;
 
 tags:
@@ -72,22 +70,21 @@ depend:
 	$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
 
 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)
 
 clean:
-	/bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-errors: $(ERRC).c
-
-$(ERRC).c: $(ERR).err
-	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
-	perl ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c
+	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rsar_err.o: ../crypto/crypto.h ../include/bn.h ../include/err.h
-rsar_err.o: ../include/rsa.h ../include/stack.h rsaref.h ../crypto/cryptlib.h
-rsaref.o: ../crypto/crypto.h ../include/bio.h ../include/bn.h
-rsaref.o: ../include/buffer.h ../include/e_os.h ../include/err.h
-rsaref.o: ../include/rand.h ../include/rsa.h ../include/stack.h rsaref.h
+rsar_err.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+rsar_err.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
+rsar_err.o: ../include/openssl/opensslv.h ../include/openssl/rsa.h
+rsar_err.o: ../include/openssl/rsaref.h ../include/openssl/stack.h
+rsaref.o: ../crypto/cryptlib.h ../include/openssl/bio.h ../include/openssl/bn.h
+rsaref.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
+rsaref.o: ../include/openssl/e_os.h ../include/openssl/err.h
+rsaref.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+rsaref.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+rsaref.o: ../include/openssl/rsaref.h ../include/openssl/stack.h