From 980e181dcc9d64312a4dddfa58f80770506f27f5 Mon Sep 17 00:00:00 2001
From: Igor Pavlov <ipavlov@users.sourceforge.net>
Date: Tue, 24 Jul 2007 00:00:00 +0000
Subject: 4.50 beta

---
 CPP/7zip/Bundles/Format7zExtract/makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'CPP/7zip/Bundles/Format7zExtract')

diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile
index a2362869..10bec119 100755
--- a/CPP/7zip/Bundles/Format7zExtract/makefile
+++ b/CPP/7zip/Bundles/Format7zExtract/makefile
@@ -118,11 +118,6 @@ PPMD_OPT_OBJS = \
 AES_OPT_OBJS = \
   $O\MyAES.obj \
 
-AES_ORIG_OBJS = \
-  $O\aescrypt.obj \
-  $O\aeskey.obj \
-  $O\aestab.obj \
-
 CRYPTO_HASH_OBJS = \
   $O\Sha256.obj \
 
@@ -138,6 +133,9 @@ C_BRANCH_OBJS = \
   $O\BranchSPARC.obj \
   $O\BranchX86.obj \
 
+C_CRYPTO = \
+  $O\Aes.obj \
+
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -161,10 +159,10 @@ OBJS = \
   $(PPMD_OPT_OBJS) \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
-  $(AES_ORIG_OBJS) \
   $(CRYPTO_HASH_OBJS) \
   $(C_OBJS) \
   $(C_BRANCH_OBJS) \
+  $(C_CRYPTO) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -208,8 +206,6 @@ $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
 
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL_O2)
-$(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O2_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL_O2)
 $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
@@ -218,5 +214,7 @@ $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
 $(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
 	$(COMPL_O2)
+$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
+	$(COMPL_O2)
 
 !include "../../Crc.mak"
-- 
cgit v1.2.3