mv surf_parse -> surfxml_parse

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1956 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/Makefile.am b/include/Makefile.am
index 62226e9..a889687 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,7 +16,7 @@ nobase_include_HEADERS = \
        msg/msg.h \
        msg/datatypes.h \
        \
-       surf/surf_parse.h \
+       surf/surfxml_parse.h \
        surf/surfxml.h \
        \
        gras/datadesc.h gras/transport.h \

diff --git a/include/surf/surf_parse.h b/include/surf/surfxml_parse.h
similarity index 96%
rename from include/surf/surf_parse.h
rename to include/surf/surfxml_parse.h
index cdc6aa1..95b68fc 100644 (file)
--- a/include/surf/surf_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -5,8 +5,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _SURF_SURF_PARSE_H
-#define _SURF_SURF_PARSE_H
+#ifndef _SURF_SURFXML_PARSE_H
+#define _SURF_SURFXML_PARSE_H
 
 #include "surf/surfxml.h"
 #include "xbt/misc.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index 694c96a..bc304b4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST= \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
-        xbt/graph_private.h \  
+        xbt/graph_private.h \
         xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
         \
        surf/maxmin_private.h \
@@ -29,7 +29,7 @@ EXTRA_DIST= \
        surf/cpu_private.h \
        surf/workstation_private.h \
        surf/surf_timer_private.h \
-       surf/surf_parse.c \
+       surf/surfxml_parse.c \
        surf/surfxml.l \
        surf/surfxml.c \
        surf/surfxml.dtd \
@@ -40,7 +40,7 @@ EXTRA_DIST= \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
        include/surf/surf.h \
-       include/surf/surf_parse_private.h \
+       include/surf/surfxml_parse_private.h \
        \
        include/xbt/xbt_portability.h \
        include/xbt/context.h \
@@ -150,7 +150,7 @@ SG_SRC=  \
   surf/maxmin.c                                                              \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
-  surf/surf_parse.c                                                          \
+  surf/surfxml_parse.c                                                          \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
   surf/surf_timer.c                                                               \
   surf/network_dassf.c                                                       \

diff --git a/src/include/surf/surf_parse_private.h b/src/include/surf/surfxml_parse_private.h
similarity index 78%
rename from src/include/surf/surf_parse_private.h
rename to src/include/surf/surfxml_parse_private.h
index d650044..b6aace4 100644 (file)
--- a/src/include/surf/surf_parse_private.h
+++ b/src/include/surf/surfxml_parse_private.h
@@ -5,12 +5,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _SURF_SURF_PARSE_PRIVATE_H
-#define _SURF_SURF_PARSE_PRIVATE_H
+#ifndef _SURF_SURFXML_PARSE_PRIVATE_H
+#define _SURF_SURFXML_PARSE_PRIVATE_H
 
 #include <stdio.h>
 #include "xbt/misc.h"
-#include "surf/surf_parse.h"
+#include "surf/surfxml_parse.h"
 #include "surf/trace_mgr.h"
 
 void surf_parse_get_trace(tmgr_trace_t *trace, const char *string);

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index c586fc5..21a1f74 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -8,7 +8,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "surf/surf_parse_private.h"
+#include "surf/surfxml_parse_private.h"
 
 static int parse_argc = -1 ;
 static char **parse_argv = NULL;

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 3d06652..16e1cbb 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,7 +12,7 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
-#include "surf/surf_parse_private.h"
+#include "surf/surfxml_parse_private.h"
 
 #define NO_MAX_DURATION -1.0
 

diff --git a/src/surf/surf_parse.c b/src/surf/surfxml_parse.c
similarity index 99%
rename from src/surf/surf_parse.c
rename to src/surf/surfxml_parse.c
index 1bbc565..6dfa95e 100644 (file)
--- a/src/surf/surf_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -7,7 +7,7 @@
 
 #include "xbt/misc.h"
 #include "xbt/log.h"
-#include "surf/surf_parse_private.h"
+#include "surf/surfxml_parse_private.h"
 #include "surf/surf_private.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf ,"Logging specific to the SURF  module");
 

diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index da7fb8a..8e0cb51 100644 (file)
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -10,7 +10,7 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "surf/surf_parse_private.h"
+#include "surf/surfxml_parse.h"
 #include "surf/surf.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen,gras,"Stub generator");