X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/111463df0d9a94d78e136d3d81ff828ea96a2cac..126a6ff45c126c2dfdde4f3a5a7ebefa36d755c4:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3f2bc94161..d5229da6fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS+= -g @GTNETS_CFLAGS@
+#AM_CPPFLAGS=
+AM_CFLAGS= -g
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -56,6 +57,8 @@ EXTRA_DIST= \
 	\
 	simdag/private.h \
 	\
+	gras/DataDesc/ddt_parse.yy.l \
+	gras/Virtu/virtu_interface.h \
 	amok/Bandwidth/bandwidth_private.h \
 	amok/amok_modinter.h
 	\
@@ -210,7 +213,7 @@ GRAS_COMMON_SRC= \
   gras/gras.c  \
   gras/Transport/transport.c          gras/Transport/transport_private.h  \
   gras/Msg/gras_msg_mod.c             gras/Msg/gras_msg_types.c           \
-  gras/Msg/gras_msg_exchange.c                                            \
+  gras/Msg/gras_msg_exchange.c        gras/Msg/gras_msg_listener.c        \
   gras/Msg/rpc.c                      gras/Msg/timer.c                    \
   gras/Msg/msg_interface.h            gras/Msg/msg_private.h              \
   \
@@ -229,17 +232,17 @@ GRAS_RL_SRC= \
   gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
   \
   gras/Virtu/rl_emul.c \
-  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c \
+  gras/Virtu/rl_process.c \
   gras/Virtu/rl_dns.c\
   \
   gras/Msg/rl_msg.c
-  
+
 GRAS_RL_SRC+=$(XBT_RL_SRC)
 
 GRAS_SG_SRC= gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
   \
   gras/Virtu/sg_emul.c \
-  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
+  gras/Virtu/sg_process.c   \
   gras/Virtu/sg_dns.c\
   \
   gras/Msg/sg_msg.c
@@ -255,7 +258,7 @@ AMOK_SRC= \
 # Deal with optional modules #
 ##############################
 
-if USE_GTNETS
+if HAVE_GTNETS
   GTNETS_USED=$(GTNETS_SRC)
 else
   GTNETS_USED=
@@ -282,7 +285,7 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
                         $(SIMIX_SRC) $(CTX_SRC) \
                         $(MSG_SRC) $(SIMDAG_SRC) \
 			$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
 ##
 ## Java cruft
@@ -293,8 +296,8 @@ lib_LTLIBRARIES += libsimgrid4java.la
 libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
                              $(SIMIX_SRC) $(JCTX_SRC) \
                              $(JMSG_C_SRC) $(MSG_SRC) \
-  		 	     $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+		 	     $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
+libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 libsimgrid4java_la_GCJFLAGS = -fjni
 
 clean-local: