Move xbt/xbt_thread.h to private interfaces since it's not always provided by the...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 17073f4..9427d57 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.
@@ -49,6 +49,7 @@ EXTRA_DIST= \
        include/surf/surfxml_parse_private.h \
        \
        include/xbt/xbt_portability.h \
+       include/xbt/xbt_thread.h \
        include/xbt/context.h \
        \
        msg/private.h \
@@ -111,8 +112,8 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_SRC=\
   \
-  xbt/snprintf.c                                                             \
-  xbt/ex.c          xbt/xbt_thread.c                                         \
+  xbt/snprintf.c    xbt/getline.c                                            \
+  xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
   \
@@ -151,6 +152,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  \
   \
@@ -161,6 +164,7 @@ RL_SRC= \
   gras/Msg/rl_msg.c
 
 SG_SRC=  \
+  gras/sg_stubs.c                         \
   xbt/context.c                                                              \
   \
   surf/maxmin.c                                                              \
@@ -191,8 +195,8 @@ if HAVE_SDP
   SG_SRC+= surf/sdp.c  
 endif
 
-if USE_SIMIX
-  SG_SRC+=simix/smx_global.c \
+SIMIX_SRC= \
+  simix/smx_global.c \
   simix/smx_deployment.c \
   simix/smx_config.c \
   simix/smx_environment.c \
@@ -200,8 +204,13 @@ if USE_SIMIX
   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 \