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.
diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index fefc585..6889b0a 100644
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -49,11 +49,10 @@
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) ; \
@@ -78,7 +77,7 @@
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
@@ -87,18 +86,3 @@
perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-o_names.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-o_names.o: ../../include/crypto.h ../../include/lhash.h ../../include/stack.h
-o_names.o: objects.h
-obj_dat.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-obj_dat.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
-obj_dat.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-obj_dat.o: ../cryptlib.h obj_dat.h objects.h
-obj_err.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-obj_err.o: ../../include/crypto.h ../../include/err.h ../../include/stack.h
-obj_err.o: objects.h
-obj_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-obj_lib.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
-obj_lib.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-obj_lib.o: ../cryptlib.h objects.h