Specify that only <platform> can be a root tag

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 51157cd..ba7cc9c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,7 +120,7 @@ VERSION_INFO= -version-info 2:0:0
 
 XBT_SRC=\
   \
-  xbt/snprintf.c    xbt/xbt_str.c                                            \
+  xbt/snprintf.c    xbt/xbt_str.c xbt/xbt_strbuff.c                          \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
@@ -350,10 +350,12 @@ clean-local:
 jardir = $(prefix)/jar 
 jar_DATA =  simgrid.jar
 
-simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
+simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd
        [ -e .classes ] || mkdir .classes
-       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) 
-       $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
+       $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
+       [ -e .classes/surf ] || mkdir .classes/surf
+       cp $(srcdir)/surf/surfxml.dtd .classes/surf
+       $(JAR) cvf simgrid.jar -C .classes .
 else
 EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
 endif
@@ -458,9 +460,9 @@ xbt/graphxml.c: xbt/graphxml.l
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
-       set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
+       set -e; mkdir -p surf; flexml --root-tags platform -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 $^
+       set -e;                flexml --root-tags platform            -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 $@