X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.org;h=83ed4c93aab2f072d34cd4a1511c8c8f578f9021;hp=00ccc32b7373aa53fe5264a17a60513766b820b7;hb=84ed90f88b0542b85a9aa50723c7787cb3bb4bd5;hpb=8857b380e21b7140508cbcdd57abbcafdc658463

diff --git a/Makefile.org b/Makefile.org
index 00ccc32b73..83ed4c93aa 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -148,7 +148,7 @@ SDIRS=  \
 	bn ec rsa dsa ecdsa dh ecdh dso engine \
 	buffer bio stack lhash rand err \
 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-	cms pqueue ts jpake store cmac
+	cms pqueue ts jpake srp store cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -295,6 +295,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 	../crypto/bn/bn_word.o \
 	../crypto/bn/bn_x931p.o \
 	../crypto/buffer/buf_str.o \
+	../crypto/cmac/cmac.o \
 	../crypto/cryptlib.o \
 	../crypto/des/cfb64ede.o \
 	../crypto/des/cfb64enc.o \
@@ -327,17 +328,12 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 	../crypto/evp/m_sha1.o \
 	../crypto/hmac/hmac.o \
 	../crypto/modes/cbc128.o \
+	../crypto/modes/ccm128.o \
 	../crypto/modes/cfb128.o \
 	../crypto/modes/ctr128.o \
 	../crypto/modes/gcm128.o \
 	../crypto/modes/ofb128.o \
-	../crypto/rand/md_rand.o \
-	../crypto/rand/rand_egd.o \
-	../crypto/rand/randfile.o \
-	../crypto/rand/rand_lib.o \
-	../crypto/rand/rand_os2.o \
-	../crypto/rand/rand_unix.o \
-	../crypto/rand/rand_win.o \
+	../crypto/modes/xts128.o \
 	../crypto/rsa/rsa_eay.o \
 	../crypto/rsa/rsa_gen.o \
 	../crypto/rsa/rsa_crpt.o \
@@ -396,7 +392,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a build_fips
 			FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
 			export CC FIPSLD_CC; \
 		fi; \
-		$(MAKE) SHLIBDIRS=crypto build-shared; \
+		$(MAKE) -e SHLIBDIRS=crypto build-shared; \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 		exit 1; \