From 1f9c694d30d544ee4ec9dcd3f9bfd1d1daace011 Mon Sep 17 00:00:00 2001 From: alegrand Date: Wed, 8 Aug 2007 13:05:19 +0000 Subject: [PATCH] Use XBT_PUBLIC_DATA instead of extern in the automatically generated xml parser headers. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4056 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/Makefile.am | 3 +++ src/Makefile.in | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 99d5edba52..a093f2b582 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -426,11 +426,14 @@ surf/surfxml.l: $(srcdir)/surf/surfxml.dtd set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ $(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 $@ + xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^ $(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 $@ else $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd diff --git a/src/Makefile.in b/src/Makefile.in index e84979eae9..ba8e8f7410 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2257,11 +2257,13 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; flexml -P surfxml --sysid=surfxml.dtd -H $@ -L $^ +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; flexml -P graphxml --sysid=graphxml.dtd -H $@ -L $^ +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected" -- 2.20.1