X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee59b06df4d96bf36d6121f936147509908d85e5..b793f24240aa7c1ae697c1bbe400da838777d9f6:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7708f9976a..bf8a056a36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,7 @@ AM_CFLAGS= -g
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/include \
-          @CFLAGS_SimGrid@
+INCLUDES= -I$(top_srcdir)/include 
 EXTRA_DIST= \
         \
 	portable.h \
@@ -29,16 +28,15 @@ EXTRA_DIST= \
 	surf/surf_private.h \
 	surf/cpu_private.h \
 	surf/workstation_private.h \
-	surf/surf_parse.l surf/surf_parse.h \
+	surf/surf_parse.l \
 	surf/network_private.h \
 	\
 	msg/private.h \
 	\
 	gras/Transport/transport_interface.h \
 	gras/Virtu/virtu_interface.h \
-	gras/Virtu/virtu_rl.h \
-	gras/Virtu/virtu_sg.h \
-	gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c
+	gras/Virtu/virtu_rl.h                 gras/Virtu/virtu_sg.h \
+	gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c
 
 #        gras_private.h
 
@@ -80,12 +78,7 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0
 #  It modifies the library name, and you thus cannot say that a library
 #   using this trick is ready for a "stable" release (say, in Debian).
 
-if HAVE_SG
- lib_LTLIBRARIES= libgrasrl.la libgrassg.la
-else
- lib_LTLIBRARIES= libgrasrl.la
-endif
-
+lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_S=\
   \
@@ -109,11 +102,8 @@ COMMON_S=\
   surf/surf_parse.c                                                          \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
   \
-  msg/task.c  \
-  msg/host.c  \
-  msg/m_process.c  \
-  msg/gos.c  \
-  msg/global.c  \
+  msg/task.c msg/host.c msg/m_process.c msg/gos.c \
+  msg/global.c msg/environment.c msg/deployment.c  \
   \
   gras/gras.c \
   \
@@ -135,16 +125,14 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 surf/surf_parse.c: surf/surf_parse.l
 	@LEX@ -o$@ -Psurf_parse_ $^
 
-libgrasrl_la_SOURCES= $(COMMON_S) \
+libgras_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
   \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
-libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_DEP@
+libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@
 
-if HAVE_SG
-  libgrassg_la_SOURCES= $(COMMON_S) \
-    gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
-    \
-    gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c
-  libgrassg_la_LDFLAGS = $(VERSION_INFO) @GRAS_SG_DEP@
-endif
+libsimgrid_la_SOURCES= $(COMMON_S) \
+  gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
+  \
+  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c
+libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@