Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(970)

Unified Diff: src/platform/tpm_lite/src/testsuite/Makefile

Issue 661474: Tpm_lite makefile changes for new version of tpm-emulator. (Closed)
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/platform/tpm_lite/src/tlcl/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/tpm_lite/src/testsuite/Makefile
diff --git a/src/platform/tpm_lite/src/testsuite/Makefile b/src/platform/tpm_lite/src/testsuite/Makefile
index ac515b762ddb1921d8cf1ad7b144ab6d4331f13f..c646a6b68d996490cf97cfeb45ae6ea0f121ea93 100644
--- a/src/platform/tpm_lite/src/testsuite/Makefile
+++ b/src/platform/tpm_lite/src/testsuite/Makefile
@@ -3,14 +3,15 @@
# found in the LICENSE file.
LIBTLCL = ../tlcl/libtlcl.a
-LIBTPMEMU = ../../../../third_party/tpm-emulator/tpmemu/libtpmemu.a
+LIBTPM = ../../../../third_party/tpm-emulator/build/tpm/libtpm.a
+LIBCRYPTO = ../../../../third_party/tpm-emulator/build/crypto/libcrypto.a
+LIBTPMEMU = ../../../../third_party/tpm-emulator/build/tpmd/unix/libtpmemu.a
+LIBS = $(LIBTLCL) $(LIBTPMEMU) $(LIBTPM) $(LIBCRYPTO)
+
CC ?= cc
-readonly: readonly.o $(LIBTLCL) $(LIBTPMEMU)
- $(CC) -g readonly.o -o readonly \
- $(LIBTLCL) \
- $(LIBTPMEMU) \
- -lgmp
+readonly: readonly.o $(LIBS)
+ $(CC) -g readonly.o -o readonly $(LIBS) -lgmp
readonly.o: readonly.c
cc -g -c -Werror -Wall -pedantic -ansi readonly.c -I../include
« no previous file with comments | « no previous file | src/platform/tpm_lite/src/tlcl/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698