Minor cleanups.

diff --git a/.gitignore b/.gitignore
index 7587e54..6014d75 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -858,7 +858,6 @@ teshsuite/xbt/parmap_test/parmap_test
 teshsuite/xbt/signals/signals
 unit-tests
 /CMakeCache.txt
-NATIVE/
 VERSION
 include/smpi/mpif.h
 include/smpi/mpi.mod

diff --git a/doc/doxygen/inside_cmake.doc b/doc/doxygen/inside_cmake.doc
index cbf5d03..3dd7526 100644 (file)
--- a/doc/doxygen/inside_cmake.doc
+++ b/doc/doxygen/inside_cmake.doc
@@ -28,7 +28,7 @@ The examples/ directory is organized as  follows:
  - examples/cpp/ for examples using the S4U API
  - examples/smpi/ or examples using the SMPI API
  - examples/platforms/ only contains platforms descriptions in the XML format (see @ref platform for details)
- 
+
 In each of these directories, there is a CMakeLists.txt file that has
 to be edited to include the new examples.
 

diff --git a/docs/source/application.rst b/docs/source/application.rst
index 39ee5c6..6ccf536 100644 (file)
--- a/docs/source/application.rst
+++ b/docs/source/application.rst
@@ -31,8 +31,8 @@ to mix several interfaces in the same simulation.
    MPI profilers). You can reuse this mechanism for any kind of trace
    that you want to replay, for example to study how a P2P DHT overlay
    reacts to a given workload.
- - Simulating algorithms with the legacy interface: :ref:`MSG for distributed
-   algorithms <MSG_doc>` (in :ref:`C <MSG_doc>`). SimGrid was founded in 1998, and many interfaces were proposed
+ - Simulating algorithms with the legacy interface in C: :ref:`MSG for distributed
+   algorithms <MSG_doc>`. SimGrid was founded in 1998, and many interfaces were proposed
    along the way. MSG (introduced around 2002) is still present in SimGrid. It
    does not evolve anymore, but given its popularity, it will not be removed
    until at least 2020. That being said, our goal is to make S4U so useful that

diff --git a/docs/source/conf.py b/docs/source/conf.py
index a16b71f..0b0eb26 100644 (file)
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -26,7 +26,7 @@ read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
 if read_the_docs_build:
     subprocess.call('pwd', shell=True) # should be in docs/source
     subprocess.call('doxygen', shell=True)
- 
+
 # -- Project information -----------------------------------------------------
 
 project = u'SimGrid'

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 276fc2e..85b862e 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -86,7 +86,6 @@ endforeach(file ${examples_to_install})
 set(source_to_pack
   ${headers_to_install}
   ${source_of_generated_headers}
-  ${JMSG_C_SRC}
   ${MC_SRC_BASE}
   ${MC_SRC}
   ${MC_SIMGRID_MC_SRC}