X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=rsaref%2FMakefile.ssl;h=6f0ef04ec4c211b0e068a5d090a812ea51db0a7e;hp=7b389960e602759275eeaf1d858438ca21aef7d1;hb=79df9d62721467927c81f1fa91568340e873ee9c;hpb=b4cadc6e1343c01b06613053a90ed2ee85e65090

diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl
index 7b389960e6..6f0ef04ec4 100644
--- a/rsaref/Makefile.ssl
+++ b/rsaref/Makefile.ssl
@@ -15,15 +15,13 @@ AR=		ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-ERR=rsaref
-ERRC=rsar_err
 GENERAL=Makefile
 TEST=
 APPS=
 
 LIB=$(TOP)/libRSAglue.a
-LIBSRC=	rsaref.c $(ERRC).c
-LIBOBJ= rsaref.o $(ERRC).o
+LIBSRC=	rsaref.c rsar_err.c
+LIBOBJ= rsaref.o rsar_err.o
 
 SRC= $(LIBSRC)
 
@@ -39,15 +37,15 @@ 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:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
-	@$(TOP)/util/mklink.sh ../include $(EXHEADER)
+	@$(TOP)/util/mklink.sh ../include/openssl $(EXHEADER)
 	@$(TOP)/util/mklink.sh ../test $(TEST)
 	@$(TOP)/util/mklink.sh ../apps $(APPS)
 
@@ -55,8 +53,8 @@ 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:
@@ -71,23 +69,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:
 	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
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rsar_err.o: ../crypto/crypto.h ../crypto/opensslv.h ../include/bn.h
-rsar_err.o: ../include/err.h ../include/rsa.h ../include/stack.h rsaref.h
-rsaref.o: ../crypto/cryptlib.h ../crypto/crypto.h ../crypto/opensslv.h
-rsaref.o: ../include/bio.h ../include/bn.h ../include/buffer.h
-rsaref.o: ../include/e_os.h ../include/err.h ../include/rand.h ../include/rsa.h
-rsaref.o: ../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