X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a1e71320dab92c8515b957212eaa1e7f6f5b88a..24f30a1f9d0c0c7b741d4c019ea3979d3d2e54e3:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 03c370df50..d5012d1b98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS= -g
+AM_CFLAGS+= -g 
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -26,7 +26,7 @@ EXTRA_DIST= \
 	xbt/graphxml.l \
 	xbt/graphxml.c \
 	xbt/graphxml.dtd \
-        xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
+        xbt/context_private.h \
 	xbt/ex_interface.h \
         \
 	surf/maxmin_private.h \
@@ -49,20 +49,29 @@ EXTRA_DIST= \
 	include/surf/surfxml_parse_private.h \
 	\
 	include/xbt/xbt_portability.h \
+	include/xbt/xbt_thread.h \
 	include/xbt/context.h \
 	\
 	msg/private.h \
 	\
 	simdag/private.h \
 	\
-	gras/Transport/transport_interface.h \
-	gras/Virtu/virtu_interface.h          gras/Virtu/virtu_private.h\
-	gras/Virtu/virtu_rl.h                 gras/Virtu/virtu_sg.h \
-	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
-	\
 	amok/Bandwidth/bandwidth_private.h \
 	amok/amok_modinter.h
 
+if USE_SIMIX
+  EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/msg_simix_private.h \
+	gras_simix/Transport/gras_simix_transport_interface.h \
+	gras_simix/Virtu/gras_simix_virtu_interface.h          gras_simix/Virtu/gras_simix_virtu_private.h\
+	gras_simix/Virtu/gras_simix_virtu_rl.h                 gras_simix/Virtu/gras_simix_virtu_sg.h \
+	gras_simix/DataDesc/gras_simix_ddt_parse.yy.l          gras_simix/DataDesc/gras_simix_ddt_parse.yy.c
+else
+  EXTRA_DIST+=gras/Transport/transport_interface.h \
+	gras/Virtu/virtu_interface.h          gras/Virtu/virtu_private.h\
+	gras/Virtu/virtu_rl.h                 gras/Virtu/virtu_sg.h \
+	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c
+endif
+
 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0
@@ -78,7 +87,7 @@ EXTRA_DIST= \
 #          |           Set to zero if current is incremented
 #          +- Increment if interfaces have been added, removed or changed
 
-VERSION_INFO= -version-info 0:0:0
+VERSION_INFO= -version-info 1:0:0
 # from `info libtool "Updating version info"` 
 # and  `info libtool "Release numbers"` 
 #
@@ -107,7 +116,7 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_SRC=\
   \
-  xbt/snprintf.c                                                             \
+  xbt/snprintf.c    xbt/getline.c	xbt/trim.c                               \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
@@ -129,24 +138,11 @@ COMMON_SRC=\
   xbt/xbt_main.c                                                             \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
-  xbt/graphxml_parse.c                                                       \
-  \
-  gras/gras.c \
-  \
-  gras/Transport/transport.c          gras/Transport/transport_private.h  \
-  \
-  gras/DataDesc/ddt_create.c          \
-  gras/DataDesc/ddt_convert.c         gras/DataDesc/ddt_exchange.c     \
-  gras/DataDesc/cbps.c                gras/DataDesc/datadesc.c         \
-  gras/DataDesc/datadesc_interface.h  gras/DataDesc/datadesc_private.h \
-  gras/DataDesc/ddt_parse.c           gras/DataDesc/ddt_parse.yy.c         gras/DataDesc/ddt_parse.yy.h \
-  \
-  gras/Msg/msg.c                      gras/Msg/rpc.c                       gras/Msg/timer.c                 \
-  gras/Msg/msg_interface.h            gras/Msg/msg_private.h           \
-  \
-  gras/Virtu/process.c gras/Virtu/gras_module.c
+  xbt/graphxml_parse.c
 
 RL_SRC= \
+  gras/rl_stubs.c                     xbt/xbt_thread.c                    \
+  \
   gras/Transport/rl_transport.c          \
   gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
   \
@@ -156,10 +152,23 @@ RL_SRC= \
   \
   gras/Msg/rl_msg.c
 
+RL_SIMIX_SRC= \
+  gras_simix/gras_simix_rl_stubs.c                     xbt/xbt_thread.c                    \
+  \
+  gras_simix/Transport/gras_simix_rl_transport.c          \
+  gras_simix/Transport/gras_simix_transport_plugin_file.c   gras_simix/Transport/gras_simix_transport_plugin_tcp.c  \
+  \
+  gras_simix/Virtu/gras_simix_rl_emul.c \
+  gras_simix/Virtu/gras_simix_rl_process.c        gras_simix/Virtu/gras_simix_rl_time.c \
+  gras_simix/Virtu/gras_simix_rl_dns.c\
+  \
+  gras_simix/Msg/gras_simix_rl_msg.c
+
 SG_SRC=  \
   xbt/context.c                                                              \
   \
   surf/maxmin.c                                                              \
+  surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
@@ -168,21 +177,91 @@ SG_SRC=  \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   \
-  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  \
-  \
   simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c                       \
-  simdag/sd_workstation.c                                                    \
-  \
-  gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
+  simdag/sd_workstation.c
+
+if HAVE_SDP
+  SG_SRC+= surf/sdp.c  
+endif
+
+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 \
+  simix/smx_action.c \
+  simix/smx_synchro.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_SIMIX_SRC=  msg_simix/msg_simix_config.c \
+  msg_simix/msg_simix_task.c \
+  msg_simix/msg_simix_host.c \
+  msg_simix/msg_simix_process.c \
+  msg_simix/msg_simix_gos.c \
+  msg_simix/msg_simix_global.c \
+  msg_simix/msg_simix_environment.c \
+  msg_simix/msg_simix_deployment.c 
+
+GRAS_SRC= gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
   \
   gras/Virtu/sg_emul.c \
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
   gras/Virtu/sg_dns.c\
   \
+  gras/sg_stubs.c                         \
   gras/Msg/sg_msg.c
 
+GRAS_SIMIX_SRC= gras_simix/Transport/gras_simix_sg_transport.c  gras_simix/Transport/gras_simix_transport_plugin_sg.c        \
+  \
+  gras_simix/Virtu/gras_simix_sg_emul.c \
+  gras_simix/Virtu/gras_simix_sg_process.c        gras_simix/Virtu/gras_simix_sg_time.c     \
+  gras_simix/Virtu/gras_simix_sg_dns.c\
+  \
+  gras_simix/gras_simix_sg_stubs.c                         \
+  gras_simix/Msg/gras_simix_sg_msg.c
+
+if USE_SIMIX
+  SG_SRC+=$(SIMIX_SRC)
+  SG_SRC+=$(MSG_SIMIX_SRC)
+  SG_SRC+=$(GRAS_SIMIX_SRC)
+  EXTRA_DIST+=$(MSG_SRC)
+  COMMON_SRC+=gras_simix/gras_simix_gras.c  \
+  gras_simix/Transport/gras_simix_transport.c          gras_simix/Transport/gras_simix_transport_private.h \
+  gras_simix/Msg/gras_simix_msg.c                      gras_simix/Msg/gras_simix_rpc.c                       gras_simix/Msg/gras_simix_timer.c                 \
+  gras_simix/Msg/gras_simix_msg_interface.h            gras_simix/Msg/gras_simix_msg_private.h           \
+  gras_simix/Virtu/gras_simix_process.c gras_simix/Virtu/gras_simix_gras_module.c  \
+  \
+  gras_simix/DataDesc/gras_simix_ddt_create.c          \
+  gras_simix/DataDesc/gras_simix_ddt_convert.c         gras_simix/DataDesc/gras_simix_ddt_exchange.c     \
+  gras_simix/DataDesc/gras_simix_cbps.c                gras_simix/DataDesc/gras_simix_datadesc.c         \
+  gras_simix/DataDesc/gras_simix_datadesc_interface.h  gras_simix/DataDesc/gras_simix_datadesc_private.h \
+  gras_simix/DataDesc/gras_simix_ddt_parse.c           gras_simix/DataDesc/gras_simix_ddt_parse.yy.c         gras_simix/DataDesc/gras_simix_ddt_parse.yy.h
+
+else  
+  EXTRA_DIST+=$(SIMIX_SRC)
+  EXTRA_DIST+=$(MSG_SIMIX_SRC)
+  EXTRA_DIST+=$(GRAS_SIMIX_SRC)
+  SG_SRC+=$(MSG_SRC)
+  SG_SRC+=$(GRAS_SRC)
+  COMMON_SRC+=gras/gras.c  \
+  gras/Transport/transport.c          gras/Transport/transport_private.h  \
+  gras/Msg/msg.c                      gras/Msg/rpc.c                       gras/Msg/timer.c                 \
+  gras/Msg/msg_interface.h            gras/Msg/msg_private.h           \
+  \
+  gras/Virtu/process.c gras/Virtu/gras_module.c  \
+  \
+  gras/DataDesc/ddt_create.c          \
+  gras/DataDesc/ddt_convert.c         gras/DataDesc/ddt_exchange.c     \
+  gras/DataDesc/cbps.c                gras/DataDesc/datadesc.c         \
+  gras/DataDesc/datadesc_interface.h  gras/DataDesc/datadesc_private.h \
+  gras/DataDesc/ddt_parse.c           gras/DataDesc/ddt_parse.yy.c         gras/DataDesc/ddt_parse.yy.h
+endif
+
 AMOK_SRC= \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
@@ -207,9 +286,9 @@ noinst_PROGRAMS=testall
 TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
             xbt/config.c
-TEST_UNITS= cunit_unit.c ex_unit.c         \
-            dynar_unit.c dict_unit.c set_unit.c swag_unit.c \
-            config_unit.c
+TEST_UNITS= ./cunit_unit.c ./ex_unit.c         \
+            ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
+            ./config_unit.c
 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
               ../include/xbt/graphxml.h xbt/graphxml.c \
@@ -223,19 +302,19 @@ TESTS=testall
 EXTRA_DIST+=$(testall_SOURCES)
 
 if MAINTAINER_MODE
-cunit_unit.c: xbt/cunit.c
+./cunit_unit.c: xbt/cunit.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-ex_unit.c: xbt/ex.c
+./ex_unit.c: xbt/ex.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-dynar_unit.c: xbt/dynar.c
+./dynar_unit.c: xbt/dynar.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-dict_unit.c: xbt/dict.c
+./dict_unit.c: xbt/dict.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-set_unit.c: xbt/set.c
+./set_unit.c: xbt/set.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-swag_unit.c: xbt/swag.c
+./swag_unit.c: xbt/swag.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
-config_unit.c: xbt/config.c
+./config_unit.c: xbt/config.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
 simgrid_units_main.c: $(TEST_UNITS)
@@ -298,7 +377,11 @@ endif
 ### Declare the library content
 ###
 
+if USE_SIMIX
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SIMIX_SRC) $(AMOK_SRC)
+else
 libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
+endif
 libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)