sk_***_new_null() seems to be there to avoid exactly this sort of thing

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

diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl
index 69b16ab23ee6b8b320bd10976a4501592e3a0b65..0e6e7b8940c62b292f028fa4df4d3fb3b542b195 100644 (file)
--- a/crypto/sha/Makefile.ssl
+++ b/crypto/sha/Makefile.ssl
@@ -5,8 +5,11 @@
 DIR=    sha
 TOP=    ../..
 CC=     cc
+CPP=    $(CC) -E
 INCLUDES=
 CFLAG=-g
+INSTALL_PREFIX=
+OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=           make -f Makefile.ssl
 MAKEDEPEND=    $(TOP)/util/domd $(TOP)
@@ -44,7 +47,7 @@ lib:    $(LIBOBJ)
 
 # elf
 asm/sx86-elf.o: asm/sx86unix.cpp
-       $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o
+       $(CPP) -DELF -x c asm/sx86unix.cpp | as -o asm/sx86-elf.o
 
 # solaris
 asm/sx86-sol.o: asm/sx86unix.cpp
@@ -60,7 +63,7 @@ asm/sx86-out.o: asm/sx86unix.cpp
 asm/sx86bsdi.o: asm/sx86unix.cpp
        $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o
 
-asm/sx86unix.cpp:
+asm/sx86unix.cpp: asm/sha1-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp)
 
 files:
@@ -68,15 +71,15 @@ files:
 
 links:
        @$(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)
+       @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+       @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+       @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:
        @for i in $(EXHEADER) ; \
        do  \
-       (cp $$i $(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
 
 tags:
@@ -88,20 +91,22 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-       $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+       $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
-
-errors:
+       rm -f asm/sx86unix.cpp *.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
-sha1dgst.o: ../opensslv.h sha.h sha_locl.h
-sha_dgst.o: ../opensslv.h sha.h sha_locl.h
-sha_one.o: sha.h
+sha1_one.o: ../../include/openssl/sha.h
+sha1dgst.o: ../../include/openssl/opensslconf.h
+sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha1dgst.o: ../md32_common.h sha_locl.h
+sha_dgst.o: ../../include/openssl/opensslconf.h
+sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha_dgst.o: ../md32_common.h sha_locl.h
+sha_one.o: ../../include/openssl/sha.h