X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a41b5fa634b7df7f823f57c4b2a3e27874df28f..ade879a8236e316c6e7ca02ec909981d957cae85:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7fb590d282..9cf54c4af4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,7 @@ 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 \
@@ -46,9 +47,7 @@ EXTRA_DIST= \
 	gras/Transport/transport_interface.h \
 	gras/Virtu/virtu_interface.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
@@ -93,7 +92,7 @@ VERSION_INFO= -release 20050131 -version-info 0:0:0
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
 
-COMMON_S=\
+COMMON_SRC=\
   \
   xbt_modinter.h    gras_modinter.h                                            \
   \
@@ -114,6 +113,7 @@ COMMON_S=\
   surf/surf.c                                                                \
   surf/surf_parse.c                                                          \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -133,6 +133,16 @@ COMMON_S=\
   \
   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_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
+
+SG_SRC=  \
+  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 
+
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 	@LEX@ -o$@ -Pgras_ddt_parse_ $^
 
@@ -143,7 +153,7 @@ 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 ; \
+	cd surf; flexml -S -L surfxml.dtd ; \
 	mv surfxml.l surfxml.l.bak ; \
 	sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
 
@@ -151,14 +161,8 @@ 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_SOURCES= $(COMMON_SRC) $(RL_SRC)
 libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@
 
-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_SOURCES= $(COMMON_SRC) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@