I probably had been drinking too much the day I have written this command... Sorry...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6658938..827215d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST= \
        surf/workstation_private.h \
        surf/surf_parse.c \
        surf/surfxml.l \
        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/surfxml.c \
        surf/surfxml.dtd \
        surf/network_private.h \


@@ -136,8 +135,8 @@ surf/surfxml.c: surf/surfxml.l
 
 surf/surfxml.l: surf/surfxml.dtd
        cd surf; flexml -b 10000000 -S -L surfxml.dtd ; \
 
 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

 
 
 libgras_la_SOURCES= $(COMMON_S) \
 
 
 libgras_la_SOURCES= $(COMMON_S) \

diff --git a/src/include/surf/surfxml.h b/src/include/surf/surfxml.h
index 6cb0edf..4916c7c 100644 (file)
--- a/src/include/surf/surfxml.h
+++ b/src/include/surf/surfxml.h
@@ -1,5 +1,5 @@
 /* XML processor/application API for ../../src/surf/surfxml.dtd.
 /* XML processor/application API for ../../src/surf/surfxml.dtd.

- * Generated 2005/01/24 16:35:22.
+ * Generated 2005/01/27 07:41:00.

  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).
  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).

diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index fd6d424..b25da70 100644 (file)
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,5 +1,5 @@
 /* Validating XML processor for surfxml.dtd.
 /* Validating XML processor for surfxml.dtd.

- * Generated 2005/01/24 16:35:24.
+ * Generated 2005/01/27 07:41:02.

  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).
  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).


@@ -42,7 +42,7 @@ const char rcs_flexml[] =
 #define FLEXML_BUFFERSTACKSIZE 10000000
 
 /* XML processor api. */
 #define FLEXML_BUFFERSTACKSIZE 10000000
 
 /* XML processor api. */

-#include "surfxml.h"
+#include "surf/surfxml.h"

 
 /* FleXML-provided data. */
 const char* pcdata;
 
 /* FleXML-provided data. */
 const char* pcdata;