Complete rewrite of the error code generation script. It now runs as a single

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

diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl
index 9b32b3d0ddd0e92bac7a2fc84edc79b24e05b35e..4033cd8c8c541d523ba4bf4ac4c9b729768f887c 100644 (file)
--- a/crypto/sha/Makefile.ssl
+++ b/crypto/sha/Makefile.ssl
@@ -39,7 +39,7 @@ all:    lib
 
 lib:    $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
-       sh $(TOP)/util/ranlib.sh $(LIB)
+       $(RANLIB) $(LIB)
        @touch lib
 
 # elf
@@ -61,23 +61,22 @@ asm/sx86bsdi.o: asm/sx86unix.cpp
        $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o
 
 asm/sx86unix.cpp:
-       (cd asm; perl sha1-586.pl cpp >sx86unix.cpp)
+       (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp)
 
 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) ; \
        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:
@@ -92,14 +91,17 @@ 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 asm/*.o
-
-errors:
+       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-sha1_one.o: sha.h sha.h sha_locl.h sha.h sha_locl.h sha.h
+sha1_one.o: ../../include/openssl/sha.h
+sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha1dgst.o: sha_locl.h
+sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha_dgst.o: sha_locl.h
+sha_one.o: ../../include/openssl/sha.h