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

diff --git a/src/Makefile.am b/src/Makefile.am
index 9dd8414f0c..a3dce08bed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_DIST= \
         \
 	portable.h \
 	\
+	xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
@@ -28,6 +29,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 +43,7 @@ EXTRA_DIST= \
 	include/surf/surf.h \
 	include/surf/surf_parse.h \
 	\
+	include/xbt/xbt_portability.h \
 	include/xbt/context.h \
 	\
 	msg/private.h \
@@ -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,26 +151,35 @@ 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
 
+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
 	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)