X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d025d7c1cb392baeaaed4b058f0ec82b9cb11fde..145e627fb31fa35087140eb8d7388af6e889823b:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3748c59b8e..9ee0c15844 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,8 @@ EXTRA_DIST= \
 	gras/Virtu/virtu_rl.h                 gras/Virtu/virtu_sg.h \
 	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
 	\
-	amok/Bandwidth/bandwidth_private.h
+	amok/Bandwidth/bandwidth_private.h \
+	amok/amok_modinter.h
 
 #        gras_private.h
 
@@ -123,8 +124,8 @@ COMMON_SRC=\
   xbt/graph.c                                                                \
   xbt/set.c                                                                  \
   xbt/xbt_matrix.c                                                           \
-  xbt/xbt_host.c                                                             \
-  xbt/module.c                                                               \
+  xbt/xbt_peer.c                                                             \
+  xbt/xbt_main.c                                                             \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
   xbt/graphxml_parse.c                                                       \
@@ -142,7 +143,7 @@ COMMON_SRC=\
   gras/Msg/msg.c                      gras/Msg/rpc.c                       gras/Msg/timer.c                 \
   gras/Msg/msg_interface.h            gras/Msg/msg_private.h           \
   \
-  gras/Virtu/process.c
+  gras/Virtu/process.c gras/Virtu/gras_module.c
 
 RL_SRC= \
   gras/Transport/rl_transport.c          \
@@ -182,9 +183,9 @@ SG_SRC=  \
   gras/Msg/sg_msg.c
 
 AMOK_SRC= \
-  amok/base.c \
+  amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
-  amok/HostManagement/hostmanagement.c
+  amok/PeerManagement/peermanagement.c
 
 ###
 ### Testing infrastructure
@@ -251,31 +252,32 @@ 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 --sysid=surfxml.dtd -S $@ -L $^
+$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
+	set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+	
+xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
+	set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
+$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
+	set -e; flexml            -P graphxml --sysid=graphxml.dtd -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 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 include/xbt/graphxml.h src/xbt/graphxml.l"