X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d71f65d9d83ec974281885f4e2bcd1abb01e05e..16072227dba258909792b99458156ab65f4ecdd3:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 06ca8aba44..3ecc070189 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,13 +33,14 @@ EXTRA_DIST= \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
 	surf/network_private.h \
+	surf/network_dassf_private.h \
 	surf/workstation_KCCFLN05_private.h \
 	\
-	include/maxmin.h \
-	include/trace_mgr.h \
-	include/surf.h \
-	include/surf_parse.h \
-	include/surfxml.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 \
 	\
@@ -66,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"` 
 #
@@ -114,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 \
@@ -138,6 +140,7 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 
 surf/surf_parse.c: surf/surfxml.c
 
+if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
 	@LEX@ -o$@ -Psurf_parse_ $^
 
@@ -146,8 +149,9 @@ surf/surfxml.l: surf/surfxml.dtd
 	mv surfxml.l surfxml.l.bak ; \
 	sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
 
-include/surf/surfxml.h: src/surf/surfxml.dtd
-	cd include/surf; flexml -H -L ../../src/surf/surfxml.dtd
+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      \