X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4af3b3329ad57dcfe30cf363b3f79f209c32a4ac..c37bfd055f255fd8b46855f9e2ac0da974f64292:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 145d972e82..f0e541d154 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -42,7 +42,6 @@ set(EXTRA_DIST
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
-  src/surf/ns3/ns3_interface.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/trace_mgr_test.cpp
   src/surf/xml/simgrid.dtd
@@ -298,36 +297,47 @@ endif()
 set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cpp )
 
+set(KERNEL_HEADERS
+  src/kernel/resource/Action.hpp
+  src/kernel/resource/Model.hpp
+  src/kernel/resource/Resource.hpp
+
+  src/kernel/routing/ClusterZone.hpp
+  src/kernel/routing/DijkstraZone.hpp
+  src/kernel/routing/DragonflyZone.hpp
+  src/kernel/routing/EmptyZone.hpp
+  src/kernel/routing/FatTreeZone.hpp
+  src/kernel/routing/FloydZone.hpp
+  src/kernel/routing/FullZone.hpp
+  src/kernel/routing/NetPoint.hpp
+  src/kernel/routing/RoutedZone.hpp
+  src/kernel/routing/TorusZone.hpp
+  src/kernel/routing/VivaldiZone.hpp  
+)
+
 set(SURF_SRC
   src/kernel/lmm/fair_bottleneck.cpp
   src/kernel/lmm/lagrange.cpp
   src/kernel/lmm/maxmin.hpp
   src/kernel/lmm/maxmin.cpp
   
+  src/kernel/resource/Action.cpp
+  src/kernel/resource/Model.cpp
+  src/kernel/resource/Resource.cpp
+  
   src/kernel/routing/ClusterZone.cpp
-  src/kernel/routing/ClusterZone.hpp
   src/kernel/routing/DijkstraZone.cpp
-  src/kernel/routing/DijkstraZone.hpp
   src/kernel/routing/DragonflyZone.cpp
-  src/kernel/routing/DragonflyZone.hpp
   src/kernel/routing/EmptyZone.cpp
-  src/kernel/routing/EmptyZone.hpp
   src/kernel/routing/FatTreeZone.cpp
-  src/kernel/routing/FatTreeZone.hpp
   src/kernel/routing/FloydZone.cpp
-  src/kernel/routing/FloydZone.hpp
   src/kernel/routing/FullZone.cpp
-  src/kernel/routing/FullZone.hpp
   src/kernel/routing/NetPoint.cpp
-  src/kernel/routing/NetPoint.hpp
   src/kernel/routing/NetZoneImpl.cpp
   src/kernel/routing/NetZoneImpl.hpp
-  src/kernel/routing/RoutedZone.cpp
-  src/kernel/routing/RoutedZone.hpp
   src/kernel/routing/TorusZone.cpp
-  src/kernel/routing/TorusZone.hpp
+  src/kernel/routing/RoutedZone.cpp
   src/kernel/routing/VivaldiZone.cpp
-  src/kernel/routing/VivaldiZone.hpp  
   
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
@@ -457,12 +467,10 @@ set(MSG_SRC
   src/msg/msg_global.cpp
   src/msg/msg_gos.cpp
   src/msg/msg_host.cpp
-  src/msg/msg_io.cpp
   src/msg/msg_mailbox.cpp
   src/msg/msg_process.cpp
   src/msg/msg_synchro.cpp
   src/msg/msg_task.cpp
-  src/msg/msg_vm.cpp
   )
 
 set(SIMDAG_SRC
@@ -670,7 +678,10 @@ set(MC_SRC
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
+  ${KERNEL_HEADERS}
+
   include/simgrid/chrono.hpp
+  include/simgrid/plugins/dvfs.h
   include/simgrid/plugins/energy.h
   include/simgrid/plugins/file_system.h
   include/simgrid/plugins/live_migration.h
@@ -708,7 +719,6 @@ set(headers_to_install
   include/smpi/smpi_extended_traces_fortran.h
   include/smpi/forward.hpp
   include/xbt.h
-  include/xbt/algorithm.hpp
   include/xbt/asserts.h
   include/xbt/automaton.h
   include/xbt/automaton.hpp
@@ -832,6 +842,7 @@ endif()
 set(DOC_SOURCES
   doc/Doxyfile.in
   doc/Layout.xml
+  doc/graphical-toc.svg
   doc/sg_thread_model.fig
   doc/simix.fig
   doc/surf_nutshell.fig
@@ -865,7 +876,8 @@ set(DOC_SOURCES
   doc/doxygen/install.doc
   doc/doxygen/install_yours.doc
   doc/doxygen/java.doc
-  doc/doxygen/tutorial_msg.doc
+  doc/tuto-msg/tuto-msg.doc
+  doc/tuto-msg/overview.svg
   doc/doxygen/tutorial_smpi.doc
   doc/doxygen/models.doc
   doc/doxygen/module-msg.doc
@@ -898,17 +910,17 @@ set(DOC_SOURCES
   doc/manpage/smpirun.1
   doc/manpage/tesh.pod
 
-  doc/msg-tuto-src/deployment0.xml
-  doc/msg-tuto-src/deployment1.xml
-  doc/msg-tuto-src/deployment2.xml
-  doc/msg-tuto-src/deployment3.xml
-  doc/msg-tuto-src/deployment_general.xml
-  doc/msg-tuto-src/Makefile
-  doc/msg-tuto-src/masterworker0.c
-  doc/msg-tuto-src/masterworker1.c
-  doc/msg-tuto-src/masterworker2.c
-  doc/msg-tuto-src/masterworker3.c
-  doc/msg-tuto-src/masterworker4.c
+  doc/tuto-msg/deployment0.xml
+  doc/tuto-msg/deployment1.xml
+  doc/tuto-msg/deployment2.xml
+  doc/tuto-msg/deployment3.xml
+  doc/tuto-msg/deployment_general.xml
+  doc/tuto-msg/Makefile
+  doc/tuto-msg/masterworker.c
+  doc/tuto-msg/masterworker-sol1.c
+  doc/tuto-msg/masterworker-sol2.c
+  doc/tuto-msg/masterworker-sol3.c
+  doc/tuto-msg/masterworker-sol4.c
 
   CITATION.bib
   )