doc: update dependencies

Add
- doxygen, required since 81eacddc68f25344ed28b15ef83f34c2918886e0
- Gnulib, required since cde235376894d1e020ed9c37b31dee52e2a33fcb
- ps executable, required for script/int-log-compiler.sh
- tpm_server executable, required for script/int-log-compiler.sh

Move
- OpenSSL to main requirements because of a5ff71abeda9a5aea269812de32afb79ef3fcb4d
- ss executable to integration test suite
- uthash to integration test suite

Remove
- g++ because there is no need for a C++ compiler
- libgcrypt because of a5ff71abeda9a5aea269812de32afb79ef3fcb4d
- m4 because it is a hard dependency of autoconf
- uriparser, removed in e394cffe3add7874299b9571e0b5140b4dc51dfe

Signed-off-by: Jonas Witschel <diabonas@gmx.de>

2 files changed, 13 insertions, 18 deletions

diff --git a/Dockerfile b/Dockerfile
index d373f2da..19dcae35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,11 @@ RUN apt-get update && apt-get install -y \
     automake \
     build-essential \
     doxygen \
-    g++ \
     gcc \
     git \
     gnulib \
     libssl-dev \
     libtool \
-    m4 \
-    iproute2 \
     pkg-config \
     wget
 
@@ -41,11 +38,9 @@ RUN CFLAGS="-I/usr/local/openssl/include" make -j$(nproc) \
 	&& cp tpm_server /usr/local/bin
 
 RUN apt-get install -y \
+    iproute2 \
     libcmocka0 \
     libcmocka-dev \
-    libgcrypt20-dev \
-    libtool \
-    liburiparser-dev \
     uthash-dev
 
 # TPM2-TSS
diff --git a/INSTALL.md b/INSTALL.md
index 1cf00cef..89cca32f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -10,22 +10,23 @@ following sections describe them for the supported platforms.
 * GNU Autoconf Archive, version >= 2017.03.21
 * GNU Automake
 * GNU Libtool
+* Gnulib
 * C compiler
 * C library development libraries and header files
 * pkg-config
-* uriparser development libraries and header files
-* libgcrypt development libraries and header files
-* uthash development libraries and header files
+* doxygen
+* OpenSSL development libraries and header files
 
 The following are dependencies only required when building test suites.
 * Integration test suite (see ./configure option --enable-integration):
-* OpenSSL development libraries and header files
+    - uthash development libraries and header files
+    - ps executable (usually in the procps package)
+    - ss executable (usually in the iproute2 package)
+    - tpm_server executable (from https://sourceforge.net/projects/ibmswtpm2/)
 * Unit test suite (see ./configure option --enable-unit):
-* cmocka unit test framework, version >= 1.0
-* ss executable (usually in the iproute2 package)
+    - cmocka unit test framework, version >= 1.0
 * Code coverage analysis:
-* lcov
-* uthash development libraries and header files
+    - lcov
 
 Most users will not need to install these dependencies.
 
@@ -36,20 +37,19 @@ $ sudo apt -y install \
   autoconf-archive \
   libcmocka0 \
   libcmocka-dev \
+  procps \
   iproute2 \
   build-essential \
   git \
   pkg-config \
   gcc \
-  g++ \
-  m4 \
   libtool \
   automake \
-  libgcrypt20-dev \
   libssl-dev \
   uthash-dev \
   autoconf \
-  gnulib
+  gnulib \
+  doxygen
 ```
 Note: In some Ubuntu versions, the lcov and autoconf-archive packages are incompatible with each other. It is recommended to download autoconf-archive directly from upstream and copy `ax_code_coverage.m4` and `ax_prog_doxygen.m4` to the `m4/` subdirectory of your tpm2-tss directory.