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 a78d849..ba7cc9c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,10 @@
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
+
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -25,6 +32,7 @@ EXTRA_DIST= \
        xbt/graphxml.c \
        xbt/graphxml.dtd \
         xbt/context_private.h \
+       xbt/log_private.h \
        xbt/ex_interface.h \
         \
        surf/maxmin_private.h \
@@ -38,7 +46,7 @@ EXTRA_DIST= \
        surf/surfxml.c \
        surf/surfxml.dtd \
        surf/network_private.h \
-       network_gtnets_private.h \
+       surf/network_gtnets_private.h \
        \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
@@ -54,12 +62,16 @@ EXTRA_DIST= \
        simdag/private.h \
        \
        gras/DataDesc/ddt_parse.yy.l \
+       gras/Virtu/virtu_rl.h \
+       gras/Virtu/virtu_sg.h \
        gras/Virtu/virtu_interface.h \
+       gras/Virtu/virtu_private.h \
+       gras/Transport/transport_interface.h \
        amok/Bandwidth/bandwidth_private.h \
-       amok/amok_modinter.h
+       amok/amok_modinter.h \
        \
-       include/simix/simix.h include/simix/datatypes.h \
-       simix/msg_simix_private.h \
+       include/simix/simix.h include/simix/datatypes.h \
+       simix/private.h \
        \
        smpi/private.h
 
@@ -108,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                                          \
@@ -321,6 +333,7 @@ endif
 ##
 ## Java cruft
 
+EXTRA_DIST+=$(JMSG_JAVA_SRC)
 if HAVE_JAVA
 lib_LTLIBRARIES += libsimgrid4java.la
 
@@ -337,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
@@ -445,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 $@