A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The xbt/xbt_context_factory.h file was merged into xbt/xbt_context_private.h
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
646b806
..
28bcb0b
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-32,8
+32,7
@@
EXTRA_DIST= \
xbt/graphxml.c \
xbt/graphxml.dtd \
xbt/xbt_context_private.h \
xbt/graphxml.c \
xbt/graphxml.dtd \
xbt/xbt_context_private.h \
- xbt/xbt_context_factory.h \
- xbt/xbt_jcontext.h \
+ xbt/xbt_context_java.h \
xbt/log_private.h \
xbt/ex_interface.h \
xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
xbt/log_private.h \
xbt/ex_interface.h \
xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
@@
-173,15
+172,15
@@
SURF_SRC= \
surf/random_mgr.c \
surf/surf.c \
surf/surfxml_parse.c \
surf/random_mgr.c \
surf/surf.c \
surf/surfxml_parse.c \
- surf/cpu.c surf/network.c
surf/workstation.c
\
+ surf/cpu.c surf/network.c
surf/network_constant.c surf/workstation.c
\
surf/surf_timer.c \
surf/workstation_ptask_L07.c \
xbt/xbt_sg_stubs.c
if CONTEXT_THREADS
surf/surf_timer.c \
surf/workstation_ptask_L07.c \
xbt/xbt_sg_stubs.c
if CONTEXT_THREADS
- SURF_SRC += xbt/xbt_os_thread.c xbt/xbt_
thread_context
.c
+ SURF_SRC += xbt/xbt_os_thread.c xbt/xbt_
context_thread
.c
else
else
- SURF_SRC += xbt/xbt_
ucontext
.c
+ SURF_SRC += xbt/xbt_
context_sysv
.c
endif
GTNETS_SRC= \
endif
GTNETS_SRC= \
@@
-218,7
+217,7
@@
MSG_SRC= msg/msg_config.c \
msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
JMSG_C_SRC = \
msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
JMSG_C_SRC = \
- xbt/xbt_
jcontext
.c \
+ xbt/xbt_
context_java
.c \
java/jxbt_utilities.c java/jxbt_utilities.h \
java/jmsg.c java/jmsg.h \
java/jmsg_channel.c java/jmsg_channel.h \
java/jxbt_utilities.c java/jxbt_utilities.h \
java/jmsg.c java/jmsg.h \
java/jmsg_channel.c java/jmsg_channel.h \