mv gs/ DataDesc/

[simgrid.git] / src / gras / Makefile.am

diff --git a/src/gras/Makefile.am b/src/gras/Makefile.am
index abf2381..22c0078 100644 (file)
--- a/src/gras/Makefile.am
+++ b/src/gras/Makefile.am
@@ -2,39 +2,50 @@ SUBDIRS=. Tests
 DISTCLEANFILES=Makefile.in
 INCLUDES= -I$(top_srcdir)/src/include -I../nws_portability/Include  \
           @CFLAGS_XML@ @CFLAGS_SimGrid@
-EXTRA_DIST=gs/parse.yy.l
+EXTRA_DIST=                 \
+       gras_private.h      \
+       Core/dict_private.h \
+       DataDesc/gs_private.h     \
+       DataDesc/parse.yy.l      
 
 
 lib_LIBRARIES= libgrasrl.a libgrassg.a
 
 noinst_LIBRARIES=libgrasutils.a
 
-#                     core/dict_multi.c
+#                     Core/dict_multi.c
 #  Common/gras.c      Common/gras_datadesc.c        Common/gras_msg.c            
+#   Messaging/messaging.c                       
 
 COMMON_S=\
   \
-  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           \
+  Core/module.c                                                                 \
+  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           \
   \
-  core/config.c                               \
+  Core/config.c                               \
   \
-  gs/datadesc.c                               \
-  gs/tools.c                                  \
-  gs/categories.h                             \
-  gs/connection.h                             \
-  gs/sequence.h                               \
-  gs/net_driver.c      gs/net_driver.h        \
-  gs/net_driver_fd.c   gs/net_interface_fd.h  \
-  gs/type_driver_rl.c  gs/type_interface_rl.h \
-  gs/type_driver.c     gs/type_driver.h       \
-  gs/message.c         gs/message.h           \
-  gs/type.c            gs/type.h              \
-  gs/parse.c           gs/parse.h             gs/parse.yy.c \
-  gs/vars.c
-
-gs/parse.yy.c: gs/parse.yy.l
+  Messaging/transport.c    Messaging/transport_private.h      \
+  Messaging/transport_sg.c Messaging/transport_tcp.c          \
+  \
+  Messaging/datadesc_simple.c                 \
+  \
+  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
+
+DataDesc/parse.yy.c: DataDesc/parse.yy.l
        flex -o$@ -Pgs_parse_ $^
 
 COMMON_L=\
@@ -46,7 +57,9 @@ libgrasutils_a_SOURCES = $(COMMON_S) Tests/gras_dummy.c
 libgrasutils_a_LIBADD = $(COMMON_L)
 
 
-libgrasrl_a_SOURCES= $(COMMON_S) RL/gras_rl.c RL/gras_rl.h
+
+# RL/gras_rl.c RL/gras_rl.h FIXME
+libgrasrl_a_SOURCES= $(COMMON_S) Messaging/messaging_rl.c
 libgrasrl_a_LIBADD= \
  $(foreach file,\
   exp_smooth forc median mse_forc protocol \
@@ -55,7 +68,8 @@ libgrasrl_a_LIBADD= \
  $(COMMON_L)
 
        
-libgrassg_a_SOURCES= $(COMMON_S) SG/gras_sg.c SG/gras_sg.h
+# SG/gras_sg.c SG/gras_sg.h FIXME      
+libgrassg_a_SOURCES= $(COMMON_S) Messaging/messaging_sg.c
 libgrassg_a_LIBADD= \
  $(COMMON_L)