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

diff --git a/src/Makefile.am b/src/Makefile.am
index f820827841..b33deede93 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS= . amok
-
 AM_CFLAGS= -g
 #AM_CFLAGS= -DNDEBUG 
 
@@ -51,9 +49,10 @@ 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
-
-
+	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
+	\
+	amok/Bandwidth/bandwidth_private.h
+	        
 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0
@@ -147,6 +146,7 @@ SG_SRC=  \
   surf/workstation_KCCFLN05.c  \
   include/surf/surfxml.h \
   \
+  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  \
   \
@@ -156,6 +156,12 @@ SG_SRC=  \
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
   gras/Virtu/sg_dns.c
 
+AMOK_SRC= \
+  amok/base.c \
+  amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c
+        
+                        
+
 BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.c \
               gras/DataDesc/ddt_parse.yy.c
 
@@ -183,10 +189,10 @@ include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
 endif
 endif
 
-libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
 libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
 
-libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
+libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm