X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fbio%2FMakefile.ssl;h=c8d20e7a4ebf317a2598cc22792aee19d79ba78b;hp=1262b07fdcfcedb53f489fb4a4e1b279f6217b33;hb=ec577822f95a8bca0023c5c77cef1a4916822d4a;hpb=1efa9c33c0ba939b91f0c16bc5a672bc8febd161

diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl
index 1262b07fdc..c8d20e7a4e 100644
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -35,8 +35,8 @@ LIBOBJ= bio_lib.o bio_cb.o $(ERRC).o \
 
 SRC= $(LIBSRC)
 
-EXHEADER= bio.h bss_file.c
-HEADER=	$(EXHEADER)
+EXHEADER= bio.h
+HEADER=	bss_file.c $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -47,24 +47,23 @@ 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) bss_file.c ; \
+	@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:
@@ -79,26 +78,26 @@ 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
+	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 ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+	$(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.
 
 b_dump.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-b_dump.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+b_dump.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 b_print.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-b_print.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+b_print.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 b_sock.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-b_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+b_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bf_buff.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
 bf_buff.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 bf_buff.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -107,7 +106,7 @@ bf_buff.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bf_buff.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bf_buff.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bf_buff.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bf_buff.o: bio.h
+bf_buff.o: ../opensslconf.h ../opensslv.h bio.h
 bf_nbio.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
 bf_nbio.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 bf_nbio.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -116,7 +115,7 @@ bf_nbio.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bf_nbio.o: ../../include/objects.h ../../include/rand.h ../../include/rc2.h
 bf_nbio.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 bf_nbio.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-bf_nbio.o: ../cryptlib.h ../crypto.h bio.h
+bf_nbio.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h bio.h
 bf_null.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
 bf_null.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 bf_null.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -125,25 +124,27 @@ bf_null.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bf_null.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bf_null.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bf_null.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bf_null.o: bio.h
+bf_null.o: ../opensslconf.h ../opensslv.h bio.h
 bio_cb.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bio_cb.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
-bio_err.o: ../../include/err.h ../../include/stack.h ../crypto.h bio.h
+bio_cb.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
+bio_err.o: ../../include/err.h ../../include/stack.h ../crypto.h ../opensslv.h
+bio_err.o: bio.h
 bio_lib.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bio_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bio_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_acpt.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_acpt.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_acpt.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_conn.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_conn.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_conn.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_fd.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_fd.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h bss_sock.c
+bss_fd.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
+bss_fd.o: bss_sock.c
 bss_file.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_log.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_log.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_log.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_mem.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_mem.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_mem.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_null.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_null.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_null.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_sock.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h