X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/253a5675682b1e78fddf4993f2825c6fed4a9ab3..754517751ffe1ca4227b69b8e10ac4bc0e10461e:/src/gras/Makefile.am

diff --git a/src/gras/Makefile.am b/src/gras/Makefile.am
index abf2381a80..4ca6ecdcde 100644
--- a/src/gras/Makefile.am
+++ b/src/gras/Makefile.am
@@ -1,62 +1,56 @@
 SUBDIRS=. Tests
 DISTCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/src/include -I../nws_portability/Include  \
+INCLUDES= -I$(top_srcdir)/src/include \
           @CFLAGS_XML@ @CFLAGS_SimGrid@
-EXTRA_DIST=gs/parse.yy.l
+EXTRA_DIST= ./gras_private.h    \
+	Core/dict_private.h \
+	Transport/transport_interface.h \
+	Virtu/virtu_interface.h \
+	Virtu/virtu_rl.h \
+	Virtu/virtu_sg.h
+#	DataDesc/parse.yy.l      
 
 
-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            
+if HAVE_SG
+ lib_LIBRARIES= libgrasrl.a libgrassg.a
+else
+ lib_LIBRARIES= libgrasrl.a
+endif
 
 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/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           \
+  Core/set.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
-	flex -o$@ -Pgs_parse_ $^
-
-COMMON_L=\
- $(foreach file,\
-  diagnostic formatutil strutil osutil, \
-  $(top_srcdir)/src/nws_portability/build-@host@/obj/$(file).o)
-
-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
-libgrasrl_a_LIBADD= \
- $(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) \
- $(COMMON_L)
+  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 \
+  \
+  Virtu/process.c
 
-	
-libgrassg_a_SOURCES= $(COMMON_S) SG/gras_sg.c SG/gras_sg.h
-libgrassg_a_LIBADD= \
- $(COMMON_L)
+# DataDesc/ddt_declare.c 
 
+DataDesc/parse.yy.c: DataDesc/parse.yy.l
+	flex -o$@ -Pgras_ddt_ $^
 
+libgrasrl_a_SOURCES= $(COMMON_S) \
+  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
+
+if HAVE_SG
+  libgrassg_a_SOURCES= $(COMMON_S) \
+    Transport/sg_transport.c  Transport/transport_plugin_sg.c             \
+    \
+    Virtu/sg_process.c        Virtu/sg_time.c                   Virtu/sg_conditional.c
+endif