From: mquinson Date: Sun, 3 Feb 2008 10:52:34 +0000 (+0000) Subject: Reintroduce a more robust hack here X-Git-Tag: v3.3~631 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cd830a0265e8f675b0410653157614aad78b8140 Reintroduce a more robust hack here git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5241 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/Makefile.am b/src/Makefile.am index 25c9f5fd20..82d91030a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -465,7 +465,9 @@ if HAVE_FLEXML surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ $(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd + rm -f $(top_srcdir)/include/surf/simgrid.h set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^ + if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ diff --git a/src/Makefile.in b/src/Makefile.in index 5c4aa27621..f368a30527 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2302,8 +2302,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ rm -f $(top_srcdir)/include/surf/simgrid.h @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^ -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ mv $(top_srcdir)/include/surf/simgrid.h $@ +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi @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@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@