moving include/surf to src/include/surf (continued)

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

diff --git a/doc/Doxyfile.API.in b/doc/Doxyfile.API.in
index 0e5057b..a024639 100644 (file)
--- a/doc/Doxyfile.API.in
+++ b/doc/Doxyfile.API.in
@@ -398,7 +398,6 @@ INPUT                  = @top_srcdir@/include/ \
                          @top_srcdir@/include/surf \
                          @top_srcdir@/include/msg \
                          @top_srcdir@/include/xbt \
                          @top_srcdir@/include/surf \
                          @top_srcdir@/include/msg \
                          @top_srcdir@/include/xbt \

-                         @top_srcdir@/src/surf/ \

                          @top_srcdir@/src/msg/ \
                          @top_srcdir@/src/xbt/ \
                          @top_srcdir@/src/modules.doc \
                          @top_srcdir@/src/msg/ \
                          @top_srcdir@/src/xbt/ \
                          @top_srcdir@/src/modules.doc \

diff --git a/src/Makefile.am b/src/Makefile.am
index 06ca8ab..9fe1400 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,11 +35,11 @@ EXTRA_DIST= \
        surf/network_private.h \
        surf/workstation_KCCFLN05_private.h \
        \
        surf/network_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 \
        \
        \
        msg/private.h \
        \


@@ -146,8 +146,8 @@ 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
 
        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

 
 libgras_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
 
 libgras_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \