include/surf/surfxml_parse_private.h \
\
include/xbt/xbt_portability.h \
- include/xbt/xbt_thread.h \
+ include/xbt/xbt_os_thread.h \
include/xbt/context.h \
\
msg/private.h \
xbt/graph.c \
xbt/set.c \
xbt/xbt_matrix.c \
+ \
+ xbt/queue.c \
+ \
xbt/xbt_peer.c \
+ \
xbt/xbt_main.c \
+ \
xbt/config.c \
xbt/cunit.c \
xbt/graphxml_parse.c
+XBT_RL_SRC = \
+ xbt/xbt_rl_synchro.c
+
+XBT_SG_SRC = \
+ xbt/xbt_sg_synchro.c
+
SURF_SRC= \
surf/maxmin.c \
surf/lagrange.c \
# Separated because we don't want it in libsimgrid4java
CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c
SIMIX_SRC= \
simix/smx_global.c \
gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h
GRAS_RL_SRC= \
- gras/rl_stubs.c xbt/xbt_thread.c \
+ gras/rl_stubs.c xbt/xbt_os_thread.c \
\
gras/Transport/rl_transport.c \
gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \
gras/Virtu/rl_dns.c\
\
gras/Msg/rl_msg.c
+
+GRAS_RL_SRC+=$(XBT_RL_SRC)
GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \
\
gras/Virtu/sg_process.c gras/Virtu/sg_time.c \
gras/Virtu/sg_dns.c\
\
- gras/sg_stubs.c \
gras/Msg/sg_msg.c
+GRAS_SG_SRC+=$(XBT_SG_SRC)
+
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
### Declare the library content
###
-lib_LTLIBRARIES= libsimgrid.la libsimgrid4java.la libgras.la
+lib_LTLIBRARIES= libsimgrid.la libgras.la
libgras_la_SOURCES= $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+##
+## Java cruft
+
+if HAVE_JAVA
+lib_LTLIBRARIES += libsimgrid4java.la
+
libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
$(SIMIX_SRC) $(JCTX_SRC) \
$(JMSG_C_SRC) $(MSG_SRC) \
[ -e .classes ] || mkdir .classes
$(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
$(JAR) cvf simgrid.jar -C .classes .;
+else
+EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+endif
if GRAMINE_MODE
else