merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c'

     and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'

--HG--
extra : convert_revision : 6b61c50f4cf888bea302ac8fcf5dbb573b443251

1 files changed, 10 insertions, 5 deletions

diff --git a/libtomcrypt/testprof/makefile.icc b/libtomcrypt/testprof/makefile.icc
index ff87660..60628ce 100644
--- a/libtomcrypt/testprof/makefile.icc
+++ b/libtomcrypt/testprof/makefile.icc
@@ -1,14 +1,19 @@
 CFLAGS += -I../src/headers -I./ 
 CC=icc
 
-OBJECTS = base64_test.o cipher_hash_test.o der_tests.o dh_tests.o                        \
+OBJECTS = base64_test.o cipher_hash_test.o der_tests.o                                   \
 dsa_test.o ecc_test.o mac_test.o modes_test.o pkcs_1_test.o rsa_test.o                   \
-store_test.o test.o x86_prof.o
+store_test.o test_driver.o x86_prof.o katja_test.o
 
-default: libtomcrypt_prof.a
+ifndef LIBTEST_S
+   LIBTEST_S = libtomcrypt_prof.a
+endif
 
-libtomcrypt_prof.a: $(OBJECTS)
-	$(AR) $(ARFLAGS) libtomcrypt_prof.a $(OBJECTS)
+default: $(LIBTEST_S)
+
+$(LIBTEST_S): $(OBJECTS)
+	$(AR) $(ARFLAGS) $@ $(OBJECTS)
+	ranlib $@
 
 clean:
 	rm -f *.o *.a