Skip to content

Commit

Permalink
build: No longer depend on libuuid
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Richey <joerichey@google.com>
  • Loading branch information
josephlr authored and idesai committed Jun 5, 2021
1 parent 3367b6d commit 210b2d6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -19,13 +19,13 @@ LIB_COMMON := lib/libcommon.a
AM_CFLAGS := \
$(INCLUDE_DIRS) $(EXTRA_CFLAGS) $(TSS2_ESYS_CFLAGS) $(TSS2_MU_CFLAGS) \
$(CRYPTO_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(TSS2_TCTILDR_CFLAGS) \
$(TSS2_RC_CFLAGS) $(TSS2_SYS_CFLAGS) $(UUID_CFLAGS)
$(TSS2_RC_CFLAGS) $(TSS2_SYS_CFLAGS)

AM_LDFLAGS := $(EXTRA_LDFLAGS) $(CODE_COVERAGE_LIBS)

LDADD = \
$(LIB_COMMON) $(TSS2_ESYS_LIBS) $(TSS2_MU_LIBS) $(CRYPTO_LIBS) $(TSS2_TCTILDR_LIBS) \
$(TSS2_RC_LIBS) $(TSS2_SYS_LIBS) $(UUID_LIBS) $(EFIVAR_LIBS)
$(TSS2_RC_LIBS) $(TSS2_SYS_LIBS) $(EFIVAR_LIBS)

AM_DISTCHECK_CONFIGURE_FLAGS = --with-bashcompdir='$$(datarootdir)/bash-completion/completions'

Expand Down
1 change: 0 additions & 1 deletion configure.ac
Expand Up @@ -60,7 +60,6 @@ PKG_CHECK_MODULES([TSS2_RC], [tss2-rc])
PKG_CHECK_MODULES([TSS2_SYS], [tss2-sys])
PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.0.2g])
PKG_CHECK_MODULES([CURL], [libcurl])
PKG_CHECK_MODULES([UUID], [uuid])

# pretty print of devicepath if efivar library is present
PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])
Expand Down
3 changes: 1 addition & 2 deletions doc/INSTALL.md
Expand Up @@ -21,7 +21,6 @@ To build and install the tpm2-tools software the following software is required:
* ESAPI - TPM2.0 TSS ESAPI library (tss2-esys) and header files
* OpenSSL libcrypto library and header files
* Curl library and header files
* Universally Unique ID library (UUID)

#### Optional Dependencies:
* To build the man pages you need [pandoc](https://github.com/jgm/pandoc)
Expand Down Expand Up @@ -59,7 +58,7 @@ The packages in the below command can be ascertained via the package manager.

```
sudo apt-get install autoconf automake libtool pkg-config gcc \
libssl-dev libcurl4-gnutls-dev uuid-dev python-yaml
libssl-dev libcurl4-gnutls-dev python-yaml
```
**Notes**:

Expand Down
1 change: 0 additions & 1 deletion lib/efi_event.h
Expand Up @@ -2,7 +2,6 @@
#ifndef TCG_EFI_EVENT_H
#define TCG_EFI_EVENT_H 1

#include <uuid/uuid.h>
#include <uchar.h>
#include <tss2/tss2_tpm2_types.h>

Expand Down

0 comments on commit 210b2d6

Please sign in to comment.