X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69719adc7957b3726e1302653bb8610f4059d493..753cae90a856db7cd223182fb9fea6853fb7713c:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cfed457e96..b73f3b613a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS= . amok
-
 AM_CFLAGS= -g
 #AM_CFLAGS= -DNDEBUG 
 
@@ -18,6 +16,7 @@ EXTRA_DIST= \
         \
 	portable.h \
 	\
+	xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
@@ -28,6 +27,7 @@ EXTRA_DIST= \
 	surf/surf_private.h \
 	surf/cpu_private.h \
 	surf/workstation_private.h \
+	surf/surf_timer_private.h \
 	surf/surf_parse.c \
 	surf/surfxml.l \
 	surf/surfxml.c \
@@ -41,6 +41,7 @@ EXTRA_DIST= \
 	include/surf/surf.h \
 	include/surf/surf_parse.h \
 	\
+	include/xbt/xbt_portability.h \
 	include/xbt/context.h \
 	\
 	msg/private.h \
@@ -48,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
@@ -66,7 +68,7 @@ EXTRA_DIST= \
 #          |           Set to zero if current is incremented
 #          +- Increment if interfaces have been added, removed or changed
 
-VERSION_INFO= -release 20050131 -version-info 0:0:0
+VERSION_INFO= -release 20050627 -version-info 0:0:0
 # from `info libtool "Updating version info"` 
 # and  `info libtool "Release numbers"` 
 #
@@ -95,18 +97,19 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_SRC=\
   \
-  xbt_modinter.h    gras_modinter.h                                            \
+  xbt_modinter.h    gras_modinter.h                                          \
   \
-  xbt/sysdep.c                                                                 \
+  xbt/sysdep.c                                                               \
   xbt/log.c         xbt/log_default_appender.c   xbt/error.c                 \
-  xbt/dynar.c                                                                  \
+  xbt/dynar.c                                                                \
   xbt/dict.c        xbt/dict_elm.c               xbt/dict_cursor.c           \
-  xbt/heap.c                                                                    \
-  xbt/fifo.c                                                                    \
-  xbt/swag.c                                                                   \
-  xbt/set.c                                                                    \
-  xbt/module.c                                                                 \
-  xbt/config.c                                                                 \
+  xbt/dict_multi.c                                                           \
+  xbt/heap.c                                                                 \
+  xbt/fifo.c                                                                 \
+  xbt/swag.c                                                                 \
+  xbt/set.c                                                                  \
+  xbt/module.c                                                               \
+  xbt/config.c                                                               \
   \
   gras/gras.c \
   \
@@ -126,8 +129,8 @@ COMMON_SRC=\
 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_emul.c \
+  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c \
   gras/Virtu/rl_dns.c
 
 SG_SRC=  \
@@ -138,6 +141,7 @@ SG_SRC=  \
   surf/surf.c                                                                \
   surf/surf_parse.c                                                          \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/surf_timer.c                                                               \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   include/surf/surfxml.h \
@@ -147,32 +151,47 @@ SG_SRC=  \
   \
   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_emul.c \
+  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
+
 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_ $^
 
+if HAVE_FLEXML
 surf/surfxml.l: surf/surfxml.dtd
-	cd surf; flexml -b 1000000 -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
+else
+
+include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
+	@echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
+	@echo "ERROR: Please install it, or if you didn't modify this file, try this:"
+	@echo "ERROR:   touch src/include/surf/surfxml.h src/surf/surfxml.l"
+	@exit 1
+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