moved attestation plugins to libpts in order to resolve circular reference with libimcv

This commit is contained in:
Andreas Steffen
2011-11-28 21:23:59 +01:00
parent d37abe0fd9
commit b448e3ece6
27 changed files with 16 additions and 15 deletions
+2 -2
View File
@@ -1108,13 +1108,13 @@ AC_OUTPUT(
src/libtncif/Makefile src/libtncif/Makefile
src/libtnccs/Makefile src/libtnccs/Makefile
src/libpts/Makefile src/libpts/Makefile
src/libpts/plugins/imc_attestation/Makefile
src/libpts/plugins/imv_attestation/Makefile
src/libimcv/Makefile src/libimcv/Makefile
src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imc_test/Makefile
src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imv_test/Makefile
src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imc_scanner/Makefile
src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile
src/libimcv/plugins/imc_attestation/Makefile
src/libimcv/plugins/imv_attestation/Makefile
src/pluto/Makefile src/pluto/Makefile
src/pluto/plugins/xauth/Makefile src/pluto/plugins/xauth/Makefile
src/whack/Makefile src/whack/Makefile
+4 -4
View File
@@ -24,14 +24,14 @@ if USE_LIBTNCCS
SUBDIRS += libtnccs SUBDIRS += libtnccs
endif endif
if USE_PTS
SUBDIRS += libpts
endif
if USE_IMCV if USE_IMCV
SUBDIRS += libimcv SUBDIRS += libimcv
endif endif
if USE_PTS
SUBDIRS += libpts
endif
if USE_LIBCHARON if USE_LIBCHARON
SUBDIRS += libcharon SUBDIRS += libcharon
endif endif
+1 -1
View File
@@ -90,7 +90,7 @@ if USE_ATTR_SQL
endif endif
if USE_IMV_ATTESTATION if USE_IMV_ATTESTATION
exes += $(top_builddir)/src/libimcv/plugins/imv_attestation/.libs/attest exes += $(top_builddir)/src/libpts/plugins/imv_attestation/.libs/attest
endif endif
checksum.c : checksum_builder $(deps) $(exes) checksum.c : checksum_builder $(deps) $(exes)
-8
View File
@@ -36,11 +36,3 @@ endif
if USE_IMV_SCANNER if USE_IMV_SCANNER
SUBDIRS += plugins/imv_scanner SUBDIRS += plugins/imv_scanner
endif endif
if USE_IMC_ATTESTATION
SUBDIRS += plugins/imc_attestation
endif
if USE_IMV_ATTESTATION
SUBDIRS += plugins/imv_attestation
endif
+9
View File
@@ -46,3 +46,12 @@ libpts_la_SOURCES = \
tcg/tcg_pts_attr_req_file_meta.h tcg/tcg_pts_attr_req_file_meta.c \ tcg/tcg_pts_attr_req_file_meta.h tcg/tcg_pts_attr_req_file_meta.c \
tcg/tcg_pts_attr_unix_file_meta.h tcg/tcg_pts_attr_unix_file_meta.c tcg/tcg_pts_attr_unix_file_meta.h tcg/tcg_pts_attr_unix_file_meta.c
SUBDIRS = .
if USE_IMC_ATTESTATION
SUBDIRS += plugins/imc_attestation
endif
if USE_IMV_ATTESTATION
SUBDIRS += plugins/imv_attestation
endif