X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31d626536ff0cdfa875075e092bf8c86a5e43710..62a02b51b60cd69b26262eae02423f1d7da31b43:/src/gras/Makefile.am

diff --git a/src/gras/Makefile.am b/src/gras/Makefile.am
index 5ff273e358..ee9462ea08 100644
--- a/src/gras/Makefile.am
+++ b/src/gras/Makefile.am
@@ -10,17 +10,14 @@ EXTRA_DIST=                 \
 
 lib_LIBRARIES= libgrasrl.a libgrassg.a
 
-noinst_LIBRARIES=libgrasutils.a
-
 #                     Core/dict_multi.c
 #  Common/gras.c      Common/gras_datadesc.c        Common/gras_msg.c            
-#   Messaging/messaging.c                       
 #   Messaging/datadesc_simple.c                 
 #   Transport/transport_sg.c 
 
 COMMON_S=\
   \
-  Core/module.c                                                                 \
+  Core/module.c      Core/core_interface.h                                      \
   Core/log.c         Core/log_default_appender.c   Core/error.c                 \
   Core/dynar.c                                                                  \
   Core/dict.c        Core/dict_elm.c               Core/dict_cursor.c           \
@@ -28,49 +25,28 @@ COMMON_S=\
   \
   Core/config.c                               \
   \
-  Transport/transport.c    Transport/transport_private.h      \
-  Transport/transport_tcp.c          \
+  Transport/transport.c          Transport/transport_private.h  \
+  \
+  DataDesc/ddt_create.c          \
+  DataDesc/ddt_convert.c         DataDesc/ddt_exchange.c     \
+  DataDesc/cbps.c                DataDesc/datadesc.c         \
+  DataDesc/datadesc_interface.h  DataDesc/datadesc_private.h \
   \
+  Msg/msg.c   Msg/msg_interface.h   Msg/msg_private.h \
   \
-  DataDesc/ddt_create.c          DataDesc/ddt_declare.c \
-  DataDesc/ddt_remote.c          DataDesc/ddt_use.c     \
-  DataDesc/cbps.c                DataDesc/datadesc.c    \
-  DataDesc/datadesc_interface.h  DataDesc/datadesc_private.h
-  
-#  DataDesc/datadesc.c                               \
-#  DataDesc/tools.c                                  \
-#  DataDesc/categories.h                             \
-#  DataDesc/connection.h                             \
-#  DataDesc/sequence.h                               \
-#  DataDesc/net_driver.c      DataDesc/net_driver.h        \
-#  DataDesc/net_driver_fd.c   DataDesc/net_interface_fd.h  \
-#  DataDesc/type_driver_rl.c  DataDesc/type_interface_rl.h \
-#  DataDesc/type_driver.c     DataDesc/type_driver.h       \
-#  DataDesc/message.c         DataDesc/message.h           \
-#  DataDesc/type.c            DataDesc/type.h              \
-#  DataDesc/parse.c           DataDesc/parse.yy.h             DataDesc/parse.yy.c \
-#  DataDesc/vars.c
+  Virtu/process.c
+
+# DataDesc/ddt_declare.c 
 
 DataDesc/parse.yy.c: DataDesc/parse.yy.l
 	flex -o$@ -Pgras_ddt_ $^
 
-libgrasutils_a_SOURCES = $(COMMON_S) 
-#Tests/gras_dummy.c
-
 libgrasrl_a_SOURCES= $(COMMON_S) \
-  Transport/rl_transport.c       \
-  Virtu/rl_process.c       Virtu/rl_time.c
+  Transport/rl_transport.c  Transport/transport_plugin_tcp.c  Transport/transport_plugin_file.c      \
+  \
+  Virtu/rl_process.c        Virtu/rl_time.c                   Virtu/rl_conditional.c
 
 libgrassg_a_SOURCES= $(COMMON_S) \
-  Transport/sg_transport.c       \
-  Virtu/sg_process.c Virtu/sg_time.c
-
-# RL/gras_rl.c RL/gras_rl.h FIXME
-
-# $(foreach file,\
-#  exp_smooth forc median mse_forc protocol \
-#  dnsutil fbuff forecast_api last_value run_mean timeouts, \
-#  $(top_srcdir)/src/nws_portability/build-@host@/obj/$(file).o) 
-
-
-	
+  Transport/sg_transport.c  Transport/transport_plugin_sg.c             \
+  \
+  Virtu/sg_process.c        Virtu/sg_time.c                   Virtu/sg_conditional.c