X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/872e6c960cfd42bfbb748574c0cf88693d0730a5..3859e43b3cf658791366f7b150cfd0bb9fb7190c:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9fe140029b..9dd8414f0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,22 +33,22 @@ EXTRA_DIST= \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
 	surf/network_private.h \
+	surf/network_dassf_private.h \
 	surf/workstation_KCCFLN05_private.h \
 	\
 	include/surf/maxmin.h \
 	include/surf/trace_mgr.h \
 	include/surf/surf.h \
 	include/surf/surf_parse.h \
-	include/surf/surfxml.h \
+	\
+	include/xbt/context.h \
 	\
 	msg/private.h \
 	\
 	gras/Transport/transport_interface.h \
-	gras/Virtu/virtu_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 \
-	\
-	modules.doc
+	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c
 
 
 #        gras_private.h
@@ -66,7 +66,7 @@ EXTRA_DIST= \
 #          |           Set to zero if current is incremented
 #          +- Increment if interfaces have been added, removed or changed
 
-VERSION_INFO= -release 20040722 -version-info 0:0:0
+VERSION_INFO= -release 20050131 -version-info 0:0:0
 # from `info libtool "Updating version info"` 
 # and  `info libtool "Release numbers"` 
 #
@@ -93,7 +93,7 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
 
-COMMON_S=\
+COMMON_SRC=\
   \
   xbt_modinter.h    gras_modinter.h                                            \
   \
@@ -107,17 +107,6 @@ COMMON_S=\
   xbt/set.c                                                                    \
   xbt/module.c                                                                 \
   xbt/config.c                                                                 \
-  xbt/context.c                                                                \
-  \
-  surf/maxmin.c                                                              \
-  surf/trace_mgr.c                                                           \
-  surf/surf.c                                                                \
-  surf/surf_parse.c                                                          \
-  surf/cpu.c   surf/network.c   surf/workstation.c                           \
-  surf/workstation_KCCFLN05.c  \
-  \
-  msg/task.c msg/host.c msg/m_process.c msg/gos.c \
-  msg/global.c msg/environment.c msg/deployment.c  \
   \
   gras/gras.c \
   \
@@ -129,34 +118,62 @@ COMMON_S=\
   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/msg_interface.h             gras/Msg/msg_private.h \
+  gras/Msg/msg.c                      gras/Msg/timer.c                 \
+  gras/Msg/msg_interface.h            gras/Msg/msg_private.h           \
   \
   gras/Virtu/process.c
 
+RL_SRC= \
+  gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c  \
+  \
+  gras/Virtu/rl_chrono.c \
+  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c gras/Virtu/rl_conditional.c \
+  gras/Virtu/rl_dns.c
+
+SG_SRC=  \
+  xbt/context.c                                                                \
+  \
+  surf/maxmin.c                                                              \
+  surf/trace_mgr.c                                                           \
+  surf/surf.c                                                                \
+  surf/surf_parse.c                                                          \
+  surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/network_dassf.c                                                       \
+  surf/workstation_KCCFLN05.c  \
+  include/surf/surfxml.h \
+  \
+  msg/task.c msg/host.c msg/m_process.c msg/gos.c \
+  msg/global.c msg/environment.c msg/deployment.c  \
+  \
+  gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
+  \
+  gras/Virtu/sg_chrono.c \
+  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c \
+  gras/Virtu/sg_dns.c
+
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 	@LEX@ -o$@ -Pgras_ddt_parse_ $^
 
 surf/surf_parse.c: surf/surfxml.c
 
+if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
 	@LEX@ -o$@ -Psurf_parse_ $^
 
 surf/surfxml.l: surf/surfxml.dtd
-	cd surf; flexml -b 10000000 -S -L surfxml.dtd ; \
+	set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd ; \
 	mv surfxml.l surfxml.l.bak ; \
 	sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
 
 include/surf/surfxml.h: surf/surfxml.dtd
 	cd include/surf; flexml -H -L ../../surf/surfxml.dtd
+endif
 
-libgras_la_SOURCES= $(COMMON_S) \
-  gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
-  \
-  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
-libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
+libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
 
-libsimgrid_la_SOURCES= $(COMMON_S) \
-  gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
-  \
-  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c
-libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@
+libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
+libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
+
+
+include $(top_srcdir)/acmacro/dist-files.mk