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

diff --git a/src/Makefile.am b/src/Makefile.am
index 545ef8a19d..fa8fe05778 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 \
@@ -36,9 +35,8 @@ EXTRA_DIST= \
 	\
 	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= libgrasrl.la libgrassg.la
 
 COMMON_S=\
   \
@@ -109,6 +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/environment.c msg/deployment.c  \
   \
   gras/gras.c \
   \
@@ -124,14 +119,6 @@ COMMON_S=\
   \
   gras/Virtu/process.c
 
-#   msg/task.c  \
-#   msg/host.c  \
-#   msg/m_process.c  \
-#   msg/gos.c  \
-#   msg/global.c  \
-#   msg/environment.c  \
-#   msg/deployment.c  
-
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 	@LEX@ -o$@ -Pgras_ddt_parse_ $^
 
@@ -144,10 +131,8 @@ libgrasrl_la_SOURCES= $(COMMON_S) \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
 libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_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
+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@