Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tspi/Makefile.am

 lib_LTLIBRARIES=libtspi.la
 
-libtspi_la_LIBADD=../trspi/libtrousers.la
+libtspi_la_LIBADD=${top_builddir}/src/trspi/libtrousers.la
 
 # On setting -version-info, from the libtool manual:
 #
 # -version-info current:revision:age
 #
 # 1. Start with version information of 0:0:0 for each libtool library.
 # 2. Update the version information only immediately before a public release of your software.
 #    More frequent updates are unnecessary, and only guarantee that the current interface
 #    number gets larger faster.
 # 3. If the library source code has changed at all since the last update, then increment
 #    revision (c:r:a becomes c:r+1:a).
 # 4. If any interfaces have been added, removed, or changed since the last update, increment
 #    current, and set revision to 0.
 # 5. If any interfaces have been added since the last public release, then increment age.
 # 6. If any interfaces have been removed since the last public release, then set age to 0.
 
-libtspi_la_LDFLAGS=-version-info 2:4:1 -lpthread @CRYPTOLIB@
+libtspi_la_LDFLAGS=-version-info 2:3:1 -lpthread @CRYPTOLIB@
 
-libtspi_la_CFLAGS=-I../include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
+libtspi_la_CFLAGS=-I$(top_srcdir)/src/include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
 
 libtspi_la_SOURCES=log.c \
                    spi_utils.c \
                    obj.c \
                    obj_policy.c \
                    tsp_policy.c \
                    obj_tpm.c \
                    obj_context.c \
                    tsp_context_mem.c \
                    tspi_context.c \
@@ skipping 124 matching lines @@
 endif
 if TSS_BUILD_PCR_EXTEND
 libtspi_la_SOURCES+=tspi_pcr_extend.c tsp_pcr_extend.c rpc/@RPC@/rpc_pcr_extend.c
 libtspi_la_CFLAGS+=-DTSS_BUILD_PCR_EXTEND
 endif
 if TSS_BUILD_SELFTEST
 libtspi_la_SOURCES+=tspi_selftest.c tsp_selftest.c rpc/@RPC@/rpc_selftest.c
 libtspi_la_CFLAGS+=-DTSS_BUILD_SELFTEST
 endif
 if TSS_BUILD_DAA
-libtspi_la_SOURCES+=tspi_daa.c tsp_daa.c obj_daacred.c obj_daaarakey.c obj_daaissuerkey.c \
+libtspi_la_SOURCES+=tspi_daa.c tsp_daa.c \
                     rpc/@RPC@/rpc_daa.c \
                     daa/daa_issuer/keypair_generator.c daa/daa_issuer/prime_gen.c \
                     daa/daa_issuer/key_correctness_proof.c daa/daa_platform/platform.c \
                     daa/daa_issuer/issuer_init.c daa/daa_issuer/issue_credential.c \
                     daa/daa_verifier/verifier_transaction.c daa/daa_verifier/verifier.c \
                     daa/daa_structs.c daa/daa_parameter.c daa/big_integer/bi_gmp.c \
                     daa/big_integer/bi_openssl.c daa/daa_anonymityrevocation/csencryption_result.c \
-                    daa/daa_anonymityrevocation/authority.c daa/big_integer/bi.c daa/utils/list.c
+                    daa/big_integer/bi.c daa/utils/list.c
 libtspi_la_CFLAGS+=-DTSS_BUILD_DAA
 endif
 if TSS_BUILD_GET_FLAGS
 libtspi_la_SOURCES+=tsp_get_flags.c
 endif
 if TSS_BUILD_PCRS_LIST
 libtspi_la_SOURCES+=obj_pcrs.c tsp_pcr.c
 libtspi_la_CFLAGS+=-DTSS_BUILD_PCRS_LIST
 endif
 if TSS_BUILD_HASH_LIST
@@ skipping 40 matching lines @@
 libtspi_la_CFLAGS+=-DTSS_BUILD_NV
 endif
 if TSS_BUILD_DELEGATION
 libtspi_la_SOURCES+=tspi_delegate.c tsp_delegate.c obj_delfamily.c rpc/@RPC@/rpc_delegate.c
 libtspi_la_CFLAGS+=-DTSS_BUILD_DELEGATION
 endif
 if TSS_BUILD_CMK
 libtspi_la_SOURCES+=tspi_cmk.c obj_migdata.c rpc/@RPC@/rpc_cmk.c
 libtspi_la_CFLAGS+=-DTSS_BUILD_CMK
 endif