kill a file that were begging for it

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index d685f2e..941782b 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -54,7 +54,6 @@ set(EXTRA_DIST
        src/include/surf/maxmin.h
        src/include/surf/trace_mgr.h
        src/include/surf/surf.h
        src/include/surf/maxmin.h
        src/include/surf/trace_mgr.h
        src/include/surf/surf.h

-       src/include/surf/surfxml_parse_private.h

        src/include/surf/surfxml_parse_values.h
        src/include/surf/random_mgr.h
        src/include/surf/surf_resource_lmm.h
        src/include/surf/surfxml_parse_values.h
        src/include/surf/random_mgr.h
        src/include/surf/surf_resource_lmm.h

diff --git a/src/include/surf/surfxml_parse_private.h b/src/include/surf/surfxml_parse_private.h
deleted file mode 100644 (file)
index 0ddc037..0000000
--- a/src/include/surf/surfxml_parse_private.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2006, 2007, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* 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_SURFXML_PARSE_PRIVATE_H
-#define _SURF_SURFXML_PARSE_PRIVATE_H
-
-#include "xbt/misc.h"
-#include "xbt/function_types.h"
-#include "surf/surfxml_parse.h"
-#include "surf/trace_mgr.h"
-
-/* FIXME: kill that file */
-
-#endif

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index bd9c56c..262790f 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -8,7 +8,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"

-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
                                 "Logging specific to SIMIX (deployment)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
                                 "Logging specific to SIMIX (deployment)");

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index d96ba82..4144678 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -10,7 +10,7 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"

-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"

 #include "surf/random_mgr.h"
 #include "instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"
 #include "surf/random_mgr.h"
 #include "instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 30b70df..b83d168 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -8,7 +8,7 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"

-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"

 #include "surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
 #include "surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 7a6cd0e..f04585d 100644 (file)
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -9,7 +9,7 @@
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "simgrid/platf.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "simgrid/platf.h"

-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"

 #include "surf/surf_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 #include "surf/surf_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);