Add xbt/host module to the lib

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5356959..3a23010 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST= \
        xbt/graphxml.c \
        xbt/graphxml.dtd \
         xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
        xbt/graphxml.c \
        xbt/graphxml.dtd \
         xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\

+       xbt/ex_interface.h \

         \
        surf/maxmin_private.h \
        surf/trace_mgr_private.h \
         \
        surf/maxmin_private.h \
        surf/trace_mgr_private.h \


@@ -119,10 +120,11 @@ COMMON_SRC=\
   xbt/swag.c                                                                 \
   xbt/graph.c                                                                \
   xbt/set.c                                                                  \
   xbt/swag.c                                                                 \
   xbt/graph.c                                                                \
   xbt/set.c                                                                  \

+  xbt/xbt_host.c                                                             \

   xbt/module.c                                                               \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
   xbt/module.c                                                               \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \

-  xbt/graphxml_parse.c                                                          \
+  xbt/graphxml_parse.c                                                       \

   \
   gras/gras.c \
   \
   \
   gras/gras.c \
   \


@@ -134,7 +136,7 @@ COMMON_SRC=\
   gras/DataDesc/datadesc_interface.h  gras/DataDesc/datadesc_private.h \
   gras/DataDesc/ddt_parse.c           gras/DataDesc/ddt_parse.yy.c         gras/DataDesc/ddt_parse.yy.h \
   \
   gras/DataDesc/datadesc_interface.h  gras/DataDesc/datadesc_private.h \
   gras/DataDesc/ddt_parse.c           gras/DataDesc/ddt_parse.yy.c         gras/DataDesc/ddt_parse.yy.h \
   \

-  gras/Msg/msg.c                      gras/Msg/timer.c                 \
+  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/Msg/msg_interface.h            gras/Msg/msg_private.h           \
   \
   gras/Virtu/process.c


@@ -175,7 +177,7 @@ SG_SRC=  \
 
 AMOK_SRC= \
   amok/base.c \
 
 AMOK_SRC= \
   amok/base.c \

-  amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c
+  amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c 

 
 ###
 ### Testing infrastructure
 
 ###
 ### Testing infrastructure


@@ -246,10 +248,8 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
 
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l

-#      @LEX@ -Psurf_parse_ -t $^ | sed 's/]]//' > $@ 

        @LEX@ -o$@ -Psurf_parse_ $^
 xbt/graphxml.c: xbt/graphxml.l
        @LEX@ -o$@ -Psurf_parse_ $^
 xbt/graphxml.c: xbt/graphxml.l

-#      @LEX@ -Pxbt_graph_parse_ -t $^ | sed 's/]]//' > $@

        @LEX@ -o$@ -Pxbt_graph_parse_ $^
 
 if HAVE_FLEXML
        @LEX@ -o$@ -Pxbt_graph_parse_ $^
 
 if HAVE_FLEXML


@@ -258,9 +258,9 @@ surf/surfxml.l: surf/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
 ../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 grahxml -S -L graphxml.dtd
+       set -e; cd xbt; flexml -b 1000000 -P graphxml -S -L graphxml.dtd

 ../include/xbt/graphxml.h: xbt/graphxml.dtd
 ../include/xbt/graphxml.h: xbt/graphxml.dtd

-       cd ../include/xbt; flexml -P grahxml -H -L ../../src/xbt/graphxml.dtd
+       cd ../include/xbt; flexml -P graphxml -H -L ../../src/xbt/graphxml.dtd

 else
 
 ../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
 else
 
 ../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd