Remove references to .org header file names.

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

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index cd7ed0567d3eb91744e85c8399708f6c82822995..1626f496fa0b87180f9a99d25b67b5b1192010c4 100644 (file)
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -19,7 +19,7 @@ DES_ENC=      des_enc.o fcrypt_b.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-GENERAL=Makefile des.org des_locl.org
+GENERAL=Makefile
 TEST=destest.c
 APPS=
 
@@ -54,7 +54,7 @@ all:  lib
 
 lib:   $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
-       sh $(TOP)/util/ranlib.sh $(LIB)
+       $(RANLIB) $(LIB)
        @touch lib
 
 # elf
@@ -90,24 +90,20 @@ asm/yx86bsdi.o: asm/yx86unix.cpp
        $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o
 
 asm/dx86unix.cpp: asm/des-586.pl
-       (cd asm; perl des-586.pl cpp >dx86unix.cpp)
+       (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp)
 
 asm/yx86unix.cpp: asm/crypt586.pl
-       (cd asm; perl crypt586.pl cpp >yx86unix.cpp)
+       (cd asm; $(PERL) crypt586.pl cpp >yx86unix.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
-       /bin/rm -f des.doc
-       /bin/rm -fr asm/perlasm
-       $(TOP)/util/point.sh ../../perlasm asm/perlasm
-       $(TOP)/util/point.sh ../../doc/des.doc des.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/point.sh ../../perlasm asm/perlasm
+       @$(TOP)/util/mklink.sh ../../include $(EXHEADER)
+       @$(TOP)/util/mklink.sh ../../test $(TEST)
+       @$(TOP)/util/mklink.sh ../../apps $(APPS)
 
 install: installs
 
@@ -130,11 +126,11 @@ 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 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:
 
@@ -147,10 +143,14 @@ cfb64enc.o: des.h des_locl.h
 cfb_enc.o: des.h des_locl.h
 des_enc.o: des.h des_locl.h
 ecb3_enc.o: des.h des_locl.h
-ecb_enc.o: des.h des_locl.h spr.h
+ecb_enc.o: ../opensslv.h des.h des_locl.h spr.h
 ede_cbcm_enc.o: des.h des_locl.h
-enc_read.o: des.h des_locl.h
-enc_writ.o: des.h des_locl.h
+enc_read.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
+enc_read.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
+enc_read.o: ../opensslv.h des.h des_locl.h
+enc_writ.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
+enc_writ.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
+enc_writ.o: ../opensslv.h des.h des_locl.h
 fcrypt.o: des.h des.h des_locl.h des_locl.h
 fcrypt_b.o: des.h des_locl.h
 ofb64ede.o: des.h des_locl.h
@@ -160,7 +160,9 @@ pcbc_enc.o: des.h des_locl.h
 qud_cksm.o: des.h des_locl.h
 rand_key.o: des.h des_locl.h
 read2pwd.o: des.h des_locl.h
-read_pwd.o: des.h des_locl.h
+read_pwd.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
+read_pwd.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
+read_pwd.o: ../opensslv.h des.h des_locl.h
 rpc_enc.o: des.h des_locl.h des_ver.h rpc_des.h
 set_key.o: des.h des_locl.h podd.h sk.h
 str2key.o: des.h des_locl.h