diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-01-24 12:47:55 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-01-24 12:47:55 +0000 |
| commit | c4e4a1e20e36c7887baeb9f0a186d739fca639f1 (patch) | |
| tree | 9ee7555f2a40c0587ba44fd4b776b26b3c5252c5 /stubdom | |
| parent | d17eec3f89aa7a3770f95357b120782dae6e72af (diff) | |
| download | xen-c4e4a1e20e36c7887baeb9f0a186d739fca639f1.tar.gz xen-c4e4a1e20e36c7887baeb9f0a186d739fca639f1.tar.bz2 xen-c4e4a1e20e36c7887baeb9f0a186d739fca639f1.zip | |
vtpm/vtpmmgr: Use libpolarssl.a instead of hardcoding own list of .o files
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'stubdom')
| -rw-r--r-- | stubdom/Makefile | 4 | ||||
| -rw-r--r-- | stubdom/vtpm/Makefile | 5 | ||||
| -rw-r--r-- | stubdom/vtpmmgr/Makefile | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile index 64ee6e23e9..970f227ee9 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -428,11 +428,11 @@ c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxc c .PHONY: vtpm-stubdom vtpm-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpm vtpm - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpm/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a" APP_LDLIBS="-ltpm -ltpm_crypto -lgmp" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpm/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a" APP_LDLIBS="-ltpm -ltpm_crypto -lgmp -lpolarssl" .PHONY: vtpmmgr-stubdom vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vtpmmgr - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpmmgr/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpmmgr/vtpmmgr.a" APP_LDLIBS="-lm" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpmmgr/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpmmgr/vtpmmgr.a" APP_LDLIBS="-lm -lpolarssl" .PHONY: pv-grub pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxc grub diff --git a/stubdom/vtpm/Makefile b/stubdom/vtpm/Makefile index 30f7a1ab2e..37051c1ffb 100644 --- a/stubdom/vtpm/Makefile +++ b/stubdom/vtpm/Makefile @@ -11,9 +11,6 @@ XEN_ROOT=../.. -PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library -PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o sha4.o padlock.o - TARGET=vtpm.a OBJS=vtpm.o vtpm_cmd.o vtpmblk.o vtpm_pcrs.o @@ -24,7 +21,7 @@ CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/crypto CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH) $(TARGET): $(OBJS) - ar -cr $@ $(OBJS) $(TPMEMU_OBJS) $(foreach obj,$(PSSL_OBJS),$(PSSL_DIR)/$(obj)) + ar -cr $@ $(OBJS) $(OBJS): vtpm_manager.h diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile index e41c261099..af13b3952b 100644 --- a/stubdom/vtpmmgr/Makefile +++ b/stubdom/vtpmmgr/Makefile @@ -11,9 +11,6 @@ XEN_ROOT=../.. -PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library -PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o bignum.o sha4.o havege.o timing.o entropy_poll.o padlock.o - TARGET=vtpmmgr.a OBJS=vtpmmgr.o vtpm_cmd_handler.o vtpm_storage.o init.o tpmrsa.o tpm.o log.o @@ -22,7 +19,7 @@ CFLAGS+=-Wno-declaration-after-statement -Wno-unused-label build: $(TARGET) $(TARGET): $(OBJS) - ar -rcs $@ $^ $(foreach obj,$(PSSL_OBJS),$(PSSL_DIR)/$(obj)) + ar -rcs $@ $^ clean: rm -f $(TARGET) $(OBJS) |