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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6658938055..5bec00373e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS= -g
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES= -I$(top_srcdir)/include 
+INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include 
 EXTRA_DIST= \
         \
 	portable.h \
@@ -30,18 +30,26 @@ EXTRA_DIST= \
 	surf/workstation_private.h \
 	surf/surf_parse.c \
 	surf/surfxml.l \
-	surf/surfxml.h \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
 	surf/network_private.h \
+	surf/network_dassf_private.h \
 	surf/workstation_KCCFLN05_private.h \
 	\
+	include/surf/maxmin.h \
+	include/surf/trace_mgr.h \
+	include/surf/surf.h \
+	include/surf/surf_parse.h \
+	include/surf/surfxml.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/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
+	\
+	modules.doc
 
 
 #        gras_private.h
@@ -59,7 +67,7 @@ EXTRA_DIST= \
 #          |           Set to zero if current is incremented
 #          +- Increment if interfaces have been added, removed or changed
 
-VERSION_INFO= -release 20040722 -version-info 0:0:0
+VERSION_INFO= -release 20050131 -version-info 0:0:0
 # from `info libtool "Updating version info"` 
 # and  `info libtool "Release numbers"` 
 #
@@ -86,7 +94,7 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0
 
 lib_LTLIBRARIES= libsimgrid.la libgras.la
 
-COMMON_S=\
+COMMON_SRC=\
   \
   xbt_modinter.h    gras_modinter.h                                            \
   \
@@ -107,6 +115,7 @@ COMMON_S=\
   surf/surf.c                                                                \
   surf/surf_parse.c                                                          \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -126,28 +135,36 @@ COMMON_S=\
   \
   gras/Virtu/process.c
 
+RL_SRC= \
+  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
+
+SG_SRC=  \
+  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 
+
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 	@LEX@ -o$@ -Pgras_ddt_parse_ $^
 
 surf/surf_parse.c: surf/surfxml.c
 
+if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
 	@LEX@ -o$@ -Psurf_parse_ $^
 
 surf/surfxml.l: surf/surfxml.dtd
 	cd surf; flexml -b 10000000 -S -L surfxml.dtd ; \
-	mv surfxml.h surfxml.h.bak ; \
-	sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.h.bak > surfxml.h
+	mv surfxml.l surfxml.l.bak ; \
+	sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
 
+include/surf/surfxml.h: surf/surfxml.dtd
+	cd include/surf; flexml -H -L ../../surf/surfxml.dtd
+endif
 
-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
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
 libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@
 
-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_SOURCES= $(COMMON_S) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@