moved attestation plugins to libpts in order to resolve circular reference with libimcv
This commit is contained in:
+2
-2
@@ -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
@@ -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
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user