Instead of telling both 'make' and the user that ranlib

[openssl.git] / crypto / rc5 / Makefile.ssl

diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl
index 666c4b6539e57fccc1946539809986d1da6c151f..10deca5ace71e8d5255d804016c898741a310e12 100644 (file)
--- a/crypto/rc5/Makefile.ssl
+++ b/crypto/rc5/Makefile.ssl
@@ -12,7 +12,8 @@ INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=          make -f Makefile.ssl
-MAKEDEPEND=    $(TOP)/util/domd $(TOP)
+MAKEDEPPROG=   makedepend
+MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=      Makefile.ssl
 AR=            ar r
 
@@ -44,12 +45,12 @@ all:        lib
 
 lib:   $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
-       $(RANLIB) $(LIB)
+       $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
 # elf
 asm/r586-elf.o: asm/r586unix.cpp
-       $(CPP) -DELF asm/r586unix.cpp | as -o asm/r586-elf.o
+       $(CPP) -DELF -x c asm/r586unix.cpp | as -o asm/r586-elf.o
 
 # solaris
 asm/r586-sol.o: asm/r586unix.cpp
@@ -65,7 +66,7 @@ asm/r586-out.o: asm/r586unix.cpp
 asm/r586bsdi.o: asm/r586unix.cpp
        $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o
 
-asm/r586unix.cpp:
+asm/r586unix.cpp: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
        (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp)
 
 files:
@@ -105,8 +106,8 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 rc5_ecb.o: ../../include/openssl/opensslv.h ../../include/openssl/rc5.h
-rc5_ecb.o: rc5_locl.h
-rc5_enc.o: ../../include/openssl/rc5.h rc5_locl.h
-rc5_skey.o: ../../include/openssl/rc5.h rc5_locl.h
-rc5cfb64.o: ../../include/openssl/rc5.h rc5_locl.h
-rc5ofb64.o: ../../include/openssl/rc5.h rc5_locl.h
+rc5_ecb.o: rc5_ecb.c rc5_locl.h
+rc5_enc.o: ../../include/openssl/rc5.h rc5_enc.c rc5_locl.h
+rc5_skey.o: ../../include/openssl/rc5.h rc5_locl.h rc5_skey.c
+rc5cfb64.o: ../../include/openssl/rc5.h rc5_locl.h rc5cfb64.c
+rc5ofb64.o: ../../include/openssl/rc5.h rc5_locl.h rc5ofb64.c