--- a/testprof/makefile.icc	Wed Mar 08 12:58:00 2006 +0000
+++ b/testprof/makefile.icc	Thu Jan 11 02:22:00 2007 +0000
@@ -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