New Makefile variables $(RANLIB) and $(PERL).

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

diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl
index 7c07f05fd5183f437605aff8c72dd04134ab6b06..68794f505912b01fda9fd464370c19566ebd8b2a 100644 (file)
--- a/crypto/rc5/Makefile.ssl
+++ b/crypto/rc5/Makefile.ssl
@@ -42,7 +42,7 @@ all:  lib
 
 lib:   $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
 
 lib:   $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)

-       sh $(TOP)/util/ranlib.sh $(LIB)
+       $(RANLIB) $(LIB)

        @touch lib
 
 # elf
        @touch lib
 
 # elf


@@ -64,18 +64,16 @@ asm/r586bsdi.o: asm/r586unix.cpp
        $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o
 
 asm/r586unix.cpp:
        $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o
 
 asm/r586unix.cpp:

-       (cd asm; perl rc5-586.pl cpp >r586unix.cpp)
+       (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp)

 
 files:
 
 files:

-       perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+       $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO

 
 links:
 
 links:

-       /bin/rm -f Makefile
-       $(TOP)/util/point.sh Makefile.ssl Makefile ;
-       # $(TOP)/util/point.sh ../../doc/rc5.doc rc5.doc ;
-       $(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) ; \
 
 install:
        @for i in $(EXHEADER) ; \


@@ -96,17 +94,17 @@ depend:
        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
 
 dclean:
        $(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:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:

-       /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

 
 errors:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 
 errors:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

-rc5_ecb.o: rc5.h rc5_locl.h
+rc5_ecb.o: ../opensslv.h rc5.h rc5_locl.h

 rc5_enc.o: rc5.h rc5_locl.h
 rc5_skey.o: rc5.h rc5_locl.h
 rc5cfb64.o: rc5.h rc5_locl.h
 rc5_enc.o: rc5.h rc5_locl.h
 rc5_skey.o: rc5.h rc5_locl.h
 rc5cfb64.o: rc5.h rc5_locl.h