General source tree makefile cleanups: Made `making xxx in yyy...' display

consistent in the source tree and replaced `/bin/rm' by `rm'.  Additonally
cleaned up the `make links' target: Remove unnecessary semicolons, subsequent
redundant removes, inline point.sh into mklink.sh to speed processing and no
longer clutter the display with confusing stuff. Instead only the actually
done links are displayed.

1 files changed, 7 insertions, 64 deletions

diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index 7870a9480e..a41b509176 100644
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -110,11 +110,10 @@ files:
 	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 $(EXHEADER)
+	@$(TOP)/util/mklink.sh ../../test $(TEST)
+	@$(TOP)/util/mklink.sh ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
@@ -124,11 +123,11 @@ install:
 	done;
 
 exptest:
-	/bin/rm -f exptest
+	rm -f exptest
 	gcc -I../../include -g2 -ggdb -o exptest exptest.c ../../libcrypto.a
 
 div:
-	/bin/rm -f a.out
+	rm -f a.out
 	gcc -I.. -g div.c ../../libcrypto.a
 
 tags:
@@ -147,7 +146,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	/bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s
+	rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s
 
 errors: $(ERRC).c
 
@@ -157,59 +156,3 @@ $(ERRC).c: $(ERR).err
 	perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-
-bn_add.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_add.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_add.o: bn.h bn_lcl.h
-bn_asm.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_asm.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_asm.o: bn.h bn_lcl.h
-bn_blind.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_blind.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_blind.o: bn.h bn_lcl.h
-bn_div.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_div.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_div.o: bn.h bn_lcl.h
-bn_err.o: ../../include/err.h bn.h
-bn_exp.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_exp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_exp.o: bn.h bn_lcl.h
-bn_exp2.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_exp2.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_exp2.o: bn.h bn_lcl.h
-bn_gcd.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_gcd.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_gcd.o: bn.h bn_lcl.h
-bn_lib.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_lib.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_lib.o: bn.h bn_lcl.h
-bn_mont.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_mont.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_mont.o: bn.h bn_lcl.h
-bn_mpi.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_mpi.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_mpi.o: bn.h bn_lcl.h
-bn_mul.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_mul.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_mul.o: bn.h bn_lcl.h
-bn_prime.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_prime.o: ../../include/err.h ../../include/rand.h ../../include/stack.h
-bn_prime.o: ../cryptlib.h ../crypto.h bn.h bn_lcl.h bn_prime.h
-bn_print.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_print.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_print.o: bn.h bn_lcl.h
-bn_rand.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_rand.o: ../../include/err.h ../../include/rand.h ../../include/stack.h
-bn_rand.o: ../cryptlib.h ../crypto.h bn.h bn_lcl.h
-bn_recp.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_recp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_recp.o: bn.h bn_lcl.h
-bn_shift.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_shift.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_shift.o: bn.h bn_lcl.h
-bn_sqr.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_sqr.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_sqr.o: bn.h bn_lcl.h
-bn_word.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-bn_word.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_word.o: bn.h bn_lcl.h