Integrate xbt_context_init/exit to the regular module mecanism; free the xbt_binary_n...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 707aeee..9124ac3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS= -g
+AM_CFLAGS+= -g 
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -63,6 +63,10 @@ EXTRA_DIST= \
        amok/Bandwidth/bandwidth_private.h \
        amok/amok_modinter.h
 
+if USE_SIMIX
+  EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/private.h
+endif
+
 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0
@@ -107,8 +111,8 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_SRC=\
   \
-  xbt/snprintf.c                                                             \
-  xbt/ex.c                                                                   \
+  xbt/snprintf.c    xbt/getline.c                                            \
+  xbt/ex.c          xbt/xbt_thread.c                                         \
   \
   xbt_modinter.h    gras_modinter.h                                          \
   \
@@ -183,6 +187,21 @@ SG_SRC=  \
   \
   gras/Msg/sg_msg.c
 
+if HAVE_SDP
+  SG_SRC+= surf/sdp.c  
+endif
+
+if USE_SIMIX
+  SG_SRC+=simix/smx_global.c \
+  simix/smx_deployment.c \
+  simix/smx_config.c \
+  simix/smx_environment.c \
+  simix/smx_host.c \
+  simix/smx_process.c \
+  simix/smx_action.c \
+  simix/smx_synchro.c
+endif
+
 AMOK_SRC= \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
@@ -220,7 +239,7 @@ testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c
 testall_LDADD=libgras.la
 TESTS=testall
 
-EXTRA_DIST+=$t(estall_SOURCES)
+EXTRA_DIST+=$(testall_SOURCES)
 
 if MAINTAINER_MODE
 cunit_unit.c: xbt/cunit.c
@@ -260,13 +279,13 @@ endif
 
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
-       set -e;@LEX@ -o$@ -Pgras_ddt_parse_ $^
+       set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^
 
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
-       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ $^
+       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
 xbt/graphxml.c: xbt/graphxml.l
-       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ $^
+       set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd