fix compilation instructions

Author: Daniel Kroening

COMPILING.md

@@ -21,45 +21,39 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.
    The GNU Make needs to be version 3.81 or higher.
    On Debian-like distributions, do
    ```
-   apt-get install g++ gcc flex bison make git libwww-perl patch openjdk-7-jdk
+   apt-get install g++ gcc flex bison make git libwww-perl patch
    ```
    On Red Hat/Fedora or derivates, do
    ```
-   yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel
+   yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6
    ```
    Note that you need g++ version 5.0 or newer.
 
    To compile JBMC, you additionally need the JDK and the java-models-library.
-
    For the JDK, on Debian-like distributions, do
    ```
-   apt-get install openjdk-7-jdk
+   apt-get install openjdk-8-jdk
    ```
    On Red Hat/Fedora or derivates, do
    ```
-   yum install java-1.7.0-openjdk-devel
-   ```
-   For the models library, do
-   ```
-   make -C jbmc/src java-models-library-download
+   yum install java-1.8.0-openjdk-devel
    ```
 
 2. As a user, get the CBMC source via
    ```
    git clone https://github.com/diffblue/cbmc cbmc-git
    ```
+
 3. On Debian or Ubuntu, do
    ```
-   cd cbmc-git/src
-   make minisat2-download
-   make
+   make -C cbmc-git/src minisat2-download
+   make -C cbmc-git/src
    ```
    On Redhat/Fedora etc., do
    ```
-   cd cbmc-git/src
-   make minisat2-download
    scl enable devtoolset-6 bash
-   make
+   make -C cbmc-git/src minisat2-download
+   make -C cbmc-git/src
    ```
 
 4. Linking against an IPASIR SAT solver
@@ -75,6 +69,12 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.
    make -C src IPASIR=../../ipasir LIBSOLVER=$(pwd)/ipasir/libipasir.a
    ```
 
+5. To compile JBMC, do
+   ```
+   make -C cbmc-git/jbmc/src java-models-library-download
+   make -C cbmc-git/jbmc/src
+   ```
+
 # COMPILATION ON SOLARIS 11
 
 1. As root, get the necessary development tools:
@@ -88,42 +88,40 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.
    export PATH=/opt/csw/bin:$PATH
    git clone https://github.com/diffblue/cbmc cbmc-git
    ```
-3. Get MiniSat2 by entering
-   ```
-   cd cbmc-git/src
-   gmake minisat2-download DOWNLOADER=wget TAR=gtar
-   ```
-4. To compile, type
+3. To compile CBMC, type
    ```
-   gmake
+   gmake -C cbmc-git/src minisat2-download DOWNLOADER=wget TAR=gtar
+   gmake -C cbmc-git/src
    ```
-   That should do it. To run, you will need
+4. To compile JBMC, type
    ```
-   export LD_LIBRARY_PATH=/usr/gcc/5.0/lib
+   gmake -C cbmc-git/jbmc/src java-models-library-download
+   gmake -C cbmc-git/jbmc/src
    ```
 
 # COMPILATION ON FREEBSD 11
 
 1. As root, get the necessary tools:
    ```
-   pkg install bash gmake git www/p5-libwww patch flex bison openjdk
+   pkg install bash gmake git www/p5-libwww patch flex bison
    ```
    To compile JBMC, additionally install
    ```
-   pkg install openjdk
+   pkg install openjdk8 wget
    ```
- 2. As a user, get the CBMC source via
+2. As a user, get the CBMC source via
    ```
    git clone https://github.com/diffblue/cbmc cbmc-git
    ```
-3. Do
+3. To compile CBMC, do
    ```
-   cd cbmc-git/src
+   gmake -C cbmc-git/src minisat2-download
+   gmake -C cbmc-git/src
    ```
-4. Do
+4. To compile JBMC, do
    ```
-   gmake minisat2-download
-   gmake
+   gmake -C cbmc-git/jbmc/src java-models-library-download
+   gmake -C cbmc-git/jbmc/src
    ```
 
 # COMPILATION ON MACOS X
@@ -140,11 +138,15 @@ Follow these instructions:
    ```
    git clone https://github.com/diffblue/cbmc cbmc-git
    ```
-3. Then type
+3. To compile CBMC, do
+   ```
+   make -C cbmc-git/src minisat2-download
+   make -C cbmc-git/src
+   ```
+4. To compile JBMC, do
    ```
-   cd cbmc-git/src
-   make minisat2-download
-   make
+   make -C cbmc-git/jbmc/src java-models-library-download
+   make -C cbmc-git/jbmc/src
    ```
 
 # COMPILATION ON WINDOWS
@@ -180,9 +182,8 @@ Follow these instructions:
       Then start the Cygwin shell.
 4. In the Cygwin shell, type
    ```
-   cd cbmc-git/src
-   make DOWNLOADER=wget minisat2-download
-   make
+   make -C cbmc-git/src DOWNLOADER=wget minisat2-download
+   make -C cbmc-git/src
    ```
 
 (Optional) A Visual Studio project file can be generated with the script