Make dist complete, and fix "make distcheck".

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 893be50..28ca9d7 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -35,6 +35,7 @@ set(EXTRA_DIST
   src/simix/smx_smurf_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
   src/simix/smx_smurf_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README

+  src/smpi/colls/COPYRIGHTS

   src/smpi/colls/colls.h
   src/smpi/private.h
   src/smpi/smpi_mpi_dt_private.h
   src/smpi/colls/colls.h
   src/smpi/private.h
   src/smpi/smpi_mpi_dt_private.h


@@ -626,11 +627,6 @@ if(enable_smpi)
     ${simgrid_sources}
     ${SMPI_SRC}
     )
     ${simgrid_sources}
     ${SMPI_SRC}
     )

-else()
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    ${SMPI_SRC}
-    )

 endif()
 
 if(${HAVE_TRACING})
 endif()
 
 if(${HAVE_TRACING})

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index b84a0f0..6a9c66c 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -179,6 +179,7 @@ set(source_to_pack
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
   ${SIMIX_SRC}

+  ${SMPI_SRC}

   ${SURF_SRC}
   ${TRACING_SRC}
   ${XBT_RL_SRC}
   ${SURF_SRC}
   ${TRACING_SRC}
   ${XBT_RL_SRC}

diff --git a/tools/check_dist_archive.exclude b/tools/check_dist_archive.exclude
index 8339ce8..ac8ac08 100644 (file)
--- a/tools/check_dist_archive.exclude
+++ b/tools/check_dist_archive.exclude
@@ -28,6 +28,13 @@
 + src/simix/simix_network\.tla
 
 + src/smpi/BUGS
 + src/simix/simix_network\.tla
 
 + src/smpi/BUGS

++ src/smpi/colls/allgather-2dmesh.c
++ src/smpi/colls/allgather-3dmesh.c
++ src/smpi/colls/allgather-bruck.c
++ src/smpi/colls/allreduce-rab-rdb.c
++ src/smpi/colls/allreduce-rab-reduce-scatter.c
++ src/smpi/colls/allreduce-smp-binomial-pipeline.c
++ src/smpi/colls/alltoall-bruck.c

 + src/smpi/fixsrc\.pl
 + src/smpi/myprintloc\.cocci
 + src/smpi/patch_source\.sh
 + src/smpi/fixsrc\.pl
 + src/smpi/myprintloc\.cocci
 + src/smpi/patch_source\.sh