moving public parts to public places and generating things to the right places

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

diff --git a/include/Makefile.am b/include/Makefile.am
index d560ab3..0291635 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -14,6 +14,9 @@ nobase_include_HEADERS = \
        msg/msg.h \
        msg/datatypes.h \
        \
        msg/msg.h \
        msg/datatypes.h \
        \

+       surf/surf_parse.h \
+       surf/surfxml.h \
+       \

        gras/datadesc.h gras/transport.h \
        gras/virtu.h gras/emul.h gras/process.h \
        \
        gras/datadesc.h gras/transport.h \
        gras/virtu.h gras/emul.h gras/process.h \
        \


@@ -22,4 +25,7 @@ nobase_include_HEADERS = \
        amok/base.h \
        amok/bandwidth.h
 
        amok/base.h \
        amok/bandwidth.h
 

+surf/surfxml.h:
+       $(MAKE) -C ../src ../include/surf/surfxml.h
+

 include $(top_srcdir)/acmacro/dist-files.mk
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/src/Makefile.am b/src/Makefile.am
index 55c1133..89c3558 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST= \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
        include/surf/surf.h \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
        include/surf/surf.h \

-       include/surf/surf_parse.h \
+       include/surf/surf_parse_private.h \

        \
        include/xbt/xbt_portability.h \
        include/xbt/context.h \
        \
        include/xbt/xbt_portability.h \
        include/xbt/context.h \


@@ -52,7 +52,7 @@ EXTRA_DIST= \
        gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
        \
        amok/Bandwidth/bandwidth_private.h
        gras/DataDesc/ddt_parse.yy.l          gras/DataDesc/ddt_parse.yy.c \
        \
        amok/Bandwidth/bandwidth_private.h

-               
+

 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0
 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0


@@ -148,7 +148,6 @@ SG_SRC=  \
   surf/surf_timer.c                                                               \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   surf/surf_timer.c                                                               \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \

-  include/surf/surfxml.h \

   \
   msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
   \
   msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \


@@ -163,10 +162,8 @@ SG_SRC=  \
 AMOK_SRC= \
   amok/base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c
 AMOK_SRC= \
   amok/base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c

-        
-                        

 
 

-BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.c \
+BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \

               gras/DataDesc/ddt_parse.yy.c
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
               gras/DataDesc/ddt_parse.yy.c
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l


@@ -178,14 +175,12 @@ surf/surfxml.c: surf/surfxml.l
 
 if HAVE_FLEXML
 surf/surfxml.l: surf/surfxml.dtd
 
 if HAVE_FLEXML
 surf/surfxml.l: surf/surfxml.dtd

-       set -e; cd surf; flexml -b 1000000 -S -L 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: surf/surfxml.dtd
-       cd include/surf; flexml -H -L ../../surf/surfxml.dtd
+       set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd
+../include/surf/surfxml.h: surf/surfxml.dtd
+       cd ../include/surf; flexml -H -L ../../src/surf/surfxml.dtd

 else
 
 else
 

-include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
+../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd

        @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
        @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
        @echo "ERROR:   touch src/include/surf/surfxml.h src/surf/surfxml.l"
        @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
        @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
        @echo "ERROR:   touch src/include/surf/surfxml.h src/surf/surfxml.l"

diff --git a/src/include/surf/surf_parse_private.h b/src/include/surf/surf_parse_private.h
index b84309f..f146103 100644 (file)
--- a/src/include/surf/surf_parse_private.h
+++ b/src/include/surf/surf_parse_private.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. */
 
 /* 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_SURF_PARSE_PRIVATE_H
+#define _SURF_SURF_PARSE_PRIVATE_H

 
 #include <stdio.h>
 #include "xbt/misc.h"
 
 #include <stdio.h>
 #include "xbt/misc.h"

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 578c7de..3d06652 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/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"

-#include "surf/surf_parse.h"
+#include "surf/surf_parse_private.h"

 
 #define NO_MAX_DURATION -1.0
 
 
 #define NO_MAX_DURATION -1.0