Use XBT_PUBLIC instead of XBT_PUBLIC_DATA

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

diff --git a/src/Makefile.am b/src/Makefile.am
index a093f2b..581a820 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -427,6 +427,7 @@ surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
 $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
        set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
        set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@

+       sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@

 
 
 xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
 
 
 xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd


@@ -434,6 +435,7 @@ xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
 $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
        set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
        set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@

+       sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@

 else
 
 $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd
 else
 
 $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd