X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fdes%2FMakefile.ssl;h=1626f496fa0b87180f9a99d25b67b5b1192010c4;hp=78b5189ee351cee486b2ef9b969babf71768d265;hb=169cc7a11245a1cdecfa01ceade27e4c9a7d7c91;hpb=7dfb0b774e6592dcbfe47015168a0ac8b44e2a17

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index 78b5189ee3..1626f496fa 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -10,7 +10,7 @@ INCLUDES=
 CFLAG=-g
 INSTALLTOP=/usr/local/ssl
 MAKE=		make -f Makefile.ssl
-MAKEDEPEND=	makedepend -f Makefile.ssl
+MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
 DES_ENC=	des_enc.o fcrypt_b.o
@@ -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=
 
@@ -30,14 +30,15 @@ LIBSRC=	cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
 	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
 	des_enc.c fcrypt_b.c read2pwd.c \
 	fcrypt.c xcbc_enc.c \
-	str2key.c  cfb64ede.c ofb64ede.c supp.c
+	str2key.c  cfb64ede.c ofb64ede.c supp.c ede_cbcm_enc.c
 
 LIBOBJ= set_key.o  ecb_enc.o  cbc_enc.o \
 	ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o  ofb64ede.o \
 	enc_read.o enc_writ.o ofb64enc.o \
 	ofb_enc.o  str2key.o  pcbc_enc.o qud_cksm.o rand_key.o \
 	${DES_ENC} read2pwd.o \
-	fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o  cbc_cksm.o supp.o
+	fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o  cbc_cksm.o supp.o \
+	ede_cbcm_enc.o
 
 SRC= $(LIBSRC)
 
@@ -53,7 +54,7 @@ all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
-	sh $(TOP)/util/ranlib.sh $(LIB)
+	$(RANLIB) $(LIB)
 	@touch lib
 
 # elf
@@ -83,30 +84,26 @@ asm/yx86-out.o: asm/yx86unix.cpp
 
 # bsdi
 asm/dx86bsdi.o: asm/dx86unix.cpp
-	$(CPP) -DBSDI asm/dx86unix.cpp | as -o asm/dx86bsdi.o
+	$(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o
 
 asm/yx86bsdi.o: asm/yx86unix.cpp
-	$(CPP) -DBSDI asm/yx86unix.cpp | as -o asm/yx86bsdi.o
+	$(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o
 
-asm/dx86unix.cpp:
-	(cd asm; perl des-586.pl cpp >dx86unix.cpp)
+asm/dx86unix.cpp: asm/des-586.pl
+	(cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp)
 
-asm/yx86unix.cpp:
-	(cd asm; perl crypt586.pl cpp >yx86unix.cpp)
+asm/yx86unix.cpp: asm/crypt586.pl
+	(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
 
@@ -129,12 +126,45 @@ 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:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+cbc_cksm.o: des.h des_locl.h
+cbc_enc.o: des.h des_locl.h
+cfb64ede.o: des.h des_locl.h
+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: ../opensslv.h des.h des_locl.h spr.h
+ede_cbcm_enc.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
+ofb64enc.o: des.h des_locl.h
+ofb_enc.o: des.h des_locl.h
+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: ../../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
+supp.o: des.h des_locl.h
+xcbc_enc.o: des.h des_locl.h