X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2773e80729fa9563fda174461a822f49fe39a25..78f33cadf14cb7670bc212570feeda9929daaabb:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3d3d312140..bb793498d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,9 +40,6 @@ EXTRA_DIST= \
 	surf/maxmin_private.h \
 	surf/trace_mgr_private.h \
 	surf/surf_private.h \
-	surf/cpu_private.h \
-	surf/workstation_private.h \
-	surf/surf_timer_private.h \
 	surf/surfxml_parse.c \
 	surf/simgrid_dtd.l \
 	surf/simgrid_dtd.c \
@@ -50,7 +47,12 @@ EXTRA_DIST= \
 	surf/network_private.h \
 	surf/network_common.h \
 	surf/network_gtnets_private.h \
+	surf/gtnets/gtnets_interface.h \
+	surf/gtnets/gtnets_simulator.h \
+	surf/gtnets/gtnets_topology.h  \
 	\
+        include/surf/surf_resource.h  \
+	include/surf/datatypes.h \
 	include/surf/maxmin.h \
 	include/surf/trace_mgr.h \
 	include/surf/surf.h \
@@ -79,7 +81,9 @@ EXTRA_DIST= \
 	include/simix/simix.h include/simix/datatypes.h \
 	simix/private.h \
 	\
-	smpi/private.h
+	smpi/private.h \
+	smpi/smpi_coll_private.h \
+	smpi/README
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -165,15 +169,19 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC= \
+  surf/surf_model.c                                                          \
+  surf/surf_action.c                                                         \
+  surf/surf_routing.c                                                        \
+  surf/surf_config.c                                                         \
   surf/maxmin.c                                                              \
-  surf/fair_bottleneck.c                                                              \
+  surf/fair_bottleneck.c                                                     \
   surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
-  surf/random_mgr.c                                                           \
+  surf/random_mgr.c                                                          \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
-  surf/surf_timer.c                                                          \
+  surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
 
@@ -196,7 +204,6 @@ CTX_SRC= xbt/xbt_context.c
 SIMIX_SRC= \
   simix/smx_global.c \
   simix/smx_deployment.c \
-  simix/smx_config.c \
   simix/smx_environment.c \
   simix/smx_host.c \
   simix/smx_process.c \
@@ -210,11 +217,13 @@ SMPI_SRC= \
   smpi/smpi_mpi.c \
   smpi/smpi_sender.c \
   smpi/smpi_receiver.c \
-  smpi/smpi_util.c
+  smpi/smpi_util.c \
+  smpi/smpi_coll.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
-  msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
+  msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c \
+  msg/msg_actions.c
 
 JMSG_C_SRC = \
   xbt/xbt_context_java.c \
@@ -224,7 +233,7 @@ JMSG_C_SRC = \
   java/jmsg_host.c          java/jmsg_host.h           \
   java/jmsg_process.c       java/jmsg_process.h        \
   java/jmsg_task.c          java/jmsg_task.h           \
-  java/jmsg_application_handler.c
+  java/jmsg_application_handler.c java/jmsg_application_handler.h
 
 JMSG_JAVA_SRC = \
   java/simgrid/msg/MsgException.java                 \
@@ -386,7 +395,7 @@ TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/config.c 
 TEST_UNITS= @builddir@/cunit_unit.c   @builddir@/ex_unit.c         \
             @builddir@/dynar_unit.c   @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
-	    @builddir@/xbt_str_unit.c @builddir@/xbt_sha_unit.c\
+	    @builddir@/xbt_str_unit.c @builddir@/xbt_strbuff_unit.c @builddir@/xbt_sha_unit.c\
             @builddir@/config_unit.c 
 
 BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \
@@ -404,23 +413,8 @@ EXTRA_DIST+=$(testall_SOURCES)
 if MAINTAINER_MODE
 CLEANFILES=$(TEST_UNITS)
 
-@builddir@/cunit_unit.c: xbt/cunit.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/ex_unit.c: xbt/ex.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/xbt_str_unit.c: xbt/xbt_str.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/xbt_sha_unit.c: xbt/xbt_sha.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/dynar_unit.c: xbt/dynar.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/dict_unit.c: xbt/dict.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/set_unit.c: xbt/set.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/swag_unit.c: xbt/swag.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/config_unit.c: xbt/config.c
+$(TEST_UNITS): xbt/cunit.c xbt/ex.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c\
+               xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c xbt/config.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
 @builddir@/simgrid_units_main.c: $(TEST_UNITS)