Add version string in binary and simplify build.

src/tlcl/tlcl.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* A lightweight TPM command library.
  *
  * The general idea is that TPM commands are array of bytes whose fields are
  * mostly compile-time constant.  The goal is to build much of the commands at
  * compile time (or build time) and change some of the fields at run time as
  * needed.  The code in generator.c builds structures containing the commands,
  * as well as the offsets of the fields that need to be set at run time.
  */
 
 #include "tlcl.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #ifdef FIRMWARE
-#include "saved-structures.h"
 #include "tss_constants.h"
 #else
 #include <tss/tcs.h>
-#include "structures.h"
 #include "tpmextras.h"
 #endif  /* FIRMWARE */
 
+#include "structures.h"
 #include "tlcl_internal.h"
+#include "version.h"
 
 #if USE_TPM_EMULATOR
 #include "tpmemu.h"
 #endif
 
 /* The file descriptor for the TPM device.
  */
 int tpm_fd = -1;
 
 /* Log level.  0 is quietest.  Be verbose by default.
@@ skipping 340 matching lines @@
   ToTpmUint32(tpm_getpermissions_cmd.index, index);
   SendReceive(tpm_getpermissions_cmd.buffer, response, sizeof(response));
   result = TpmReturnCode(response);
   if (result != TPM_SUCCESS) {
     return result;
   }
   nvdata = response + kTpmResponseHeaderLength + sizeof(size);
   FromTpmUint32(nvdata + kNvDataPublicPermissionsOffset, permissions);
   return result;
 }