merge of '73fe066c5d9e2395354ba74756124d45c978a04d'

     and 'f5014cc84558f1e8eba42dbecf9f72f94bfe6134'

--HG--
branch : channel-fix
extra : convert_revision : cc6095ce978e5f9e51ece6f1717499bc73594bcc

1 files changed, 15 insertions, 6 deletions

diff --git a/libtomcrypt/testprof/makefile b/libtomcrypt/testprof/makefile
index f4be577..4cc70ff 100644
--- a/libtomcrypt/testprof/makefile
+++ b/libtomcrypt/testprof/makefile
@@ -1,14 +1,23 @@
 CFLAGS += -I../src/headers -I./ -Wall -W
 
-OBJECTS = base64_test.o cipher_hash_test.o der_tests.o dh_tests.o                        \
+# ranlib tools
+ifndef RANLIB
+   RANLIB=ranlib
+endif
+
+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
+
+ifndef LIBTEST_S
+   LIBTEST_S=libtomcrypt_prof.a
+endif
 
-default: libtomcrypt_prof.a
+default: $(LIBTEST_S)
 
-libtomcrypt_prof.a: $(OBJECTS)
-	$(AR) $(ARFLAGS) libtomcrypt_prof.a $(OBJECTS)
-	ranlib libtomcrypt_prof.a
+$(LIBTEST_S): $(OBJECTS)
+	$(AR) $(ARFLAGS) $@ $(OBJECTS)
+	$(RANLIB) $@
 
 clean:
 	rm -f *.o *.a