Make sure that SIMIX is in the distributed tarballs

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a974ca1..88af7b5 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
@@ -78,7 +82,7 @@ EXTRA_DIST= \
 #          |           Set to zero if current is incremented
 #          +- Increment if interfaces have been added, removed or changed
 
-VERSION_INFO= -release 20050627 -version-info 0:0:0
+VERSION_INFO= -version-info 0:0:0
 # from `info libtool "Updating version info"` 
 # and  `info libtool "Release numbers"` 
 #
@@ -104,11 +108,10 @@ VERSION_INFO= -release 20050627 -version-info 0:0:0
 #   using this trick is ready for a "stable" release (say, in Debian).
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
-noinst_PROGRAMS=testall
 
 COMMON_SRC=\
   \
-  xbt/snprintf.c                                                             \
+  xbt/snprintf.c    xbt/getline.c                                            \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
@@ -148,6 +151,8 @@ COMMON_SRC=\
   gras/Virtu/process.c gras/Virtu/gras_module.c
 
 RL_SRC= \
+  gras/rl_stubs.c                     xbt/xbt_thread.c                    \
+  \
   gras/Transport/rl_transport.c          \
   gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
   \
@@ -158,6 +163,7 @@ RL_SRC= \
   gras/Msg/rl_msg.c
 
 SG_SRC=  \
+  gras/sg_stubs.c                         \
   xbt/context.c                                                              \
   \
   surf/maxmin.c                                                              \
@@ -184,11 +190,33 @@ SG_SRC=  \
   \
   gras/Msg/sg_msg.c
 
+if HAVE_SDP
+  SG_SRC+= surf/sdp.c  
+endif
+
+SIMIX_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
+if USE_SIMIX
+  SG_SRC+=SIMIX_SRC
+else  
+  EXTRA_DIST+=SIMIX_SRC
+endif
+
+
 AMOK_SRC= \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
   amok/PeerManagement/peermanagement.c
 
+if GRAMINE_MODE
+else 
 ###
 ### Testing infrastructure
 ###
@@ -202,6 +230,7 @@ AMOK_SRC= \
 
 # Suites and tests run in the given order.
 
+noinst_PROGRAMS=testall
 TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
             xbt/config.c
@@ -258,13 +287,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
@@ -290,6 +319,7 @@ $(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graph
        @exit 1
 endif
 endif
+endif
 
 ###
 ### Declare the library content