X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4fd88ca71adcbda9e58f38c0e8b629a360463299..702dbc47db2ffe8af2f299c49f64a04a3b8dfc30:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ce0c12b7b..24f1e181c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \
@@ -126,7 +127,9 @@ COMMON_SRC=\
 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
+  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                                                                \
@@ -143,11 +146,11 @@ SG_SRC=  \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
   msg/global.c msg/environment.c msg/deployment.c  \
   \
-  gras/chrono.c \
-  \
   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/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_ $^
@@ -158,13 +161,21 @@ 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 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
+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)
@@ -172,3 +183,6 @@ libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
+
+
+include $(top_srcdir)/acmacro/dist-files.mk