X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d548f22c406ea2d901977d5c9422881186907b7..7362918af654000c20127d0b98dfb28938e76eb9:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c3fe26cf42..c9a4191576 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,8 @@ EXTRA_DIST= \
 	\
 	msg/private.h \
 	\
+	simdag/private.h \
+	\
 	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 \
@@ -121,7 +123,7 @@ COMMON_SRC=\
   xbt/graph.c                                                                \
   xbt/set.c                                                                  \
   xbt/xbt_matrix.c                                                           \
-  xbt/xbt_host.c                                                             \
+  xbt/xbt_peer.c                                                             \
   xbt/module.c                                                               \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
@@ -153,14 +155,14 @@ RL_SRC= \
   gras/Msg/rl_msg.c
 
 SG_SRC=  \
-  xbt/context.c                                                                \
+  xbt/context.c                                                              \
   \
   surf/maxmin.c                                                              \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
-  surf/surfxml_parse.c                                                          \
+  surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
-  surf/surf_timer.c                                                               \
+  surf/surf_timer.c                                                          \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   \
@@ -168,7 +170,10 @@ 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/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
+  simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c                       \
+  simdag/sd_workstation.c                                                    \
+  \
+  gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
   \
   gras/Virtu/sg_emul.c \
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
@@ -179,7 +184,7 @@ SG_SRC=  \
 AMOK_SRC= \
   amok/base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
-  amok/HostManagement/hostmanagement.c
+  amok/PeerManagement/peermanagement.c
 
 ###
 ### Testing infrastructure
@@ -246,34 +251,35 @@ endif
 
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
-	@LEX@ -o$@ -Pgras_ddt_parse_ $^
+	set -e;@LEX@ -o$@ -Pgras_ddt_parse_ $^
 
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
-	@LEX@ -o$@ -Psurf_parse_ $^
+	set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ $^
 xbt/graphxml.c: xbt/graphxml.l
-	@LEX@ -o$@ -Pxbt_graph_parse_ $^
+	set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ $^
 
 if HAVE_FLEXML
-surf/surfxml.l: surf/surfxml.dtd
-	set -e; cd surf; flexml -b 1000000 -P surfxml -S -L surfxml.dtd
-../include/surf/surfxml.h: surf/surfxml.dtd
-	cd ../include/surf; flexml -P surfxml -H -L ../../src/surf/surfxml.dtd
-xbt/graphxml.l: xbt/graphxml.dtd
-	set -e; cd xbt; flexml -b 1000000 -P graphxml -S -L graphxml.dtd
-../include/xbt/graphxml.h: xbt/graphxml.dtd
-	cd ../include/xbt; flexml -P graphxml -H -L ../../src/xbt/graphxml.dtd
+surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
+	set -e; mkdir -p surf; flexml -b 1000000 -P surfxml -S $@ -L $^
+$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
+	set -e;                flexml            -P surfxml -H $@ -L $^
+	
+xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
+	set -e; flexml -b 1000000 -P graphxml -S $@ -L $^
+$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
+	set -e; flexml -P graphxml -H $@ -L $^
 else
 
-../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
+$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/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"
+	@echo "ERROR:   touch include/surf/surfxml.h src/surf/surfxml.l"
 	@exit 1
-../include/xbt/graphxml.h xbt/graphxml.l: xbt/graphxml.dtd
+$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd
 	@echo "ERROR: src/xbt/graphxml.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/xbt/graphxml.h src/xbt/graphxml.l"
+	@echo "ERROR:   touch include/xbt/graphxml.h src/xbt/graphxml.l"
 	@exit 1
 endif
 endif