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
SURF: Kill the SDP model
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
3f42ae4
..
f60d142
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-40,9
+40,6
@@
EXTRA_DIST= \
surf/maxmin_private.h \
surf/trace_mgr_private.h \
surf/surf_private.h \
surf/maxmin_private.h \
surf/trace_mgr_private.h \
surf/surf_private.h \
- surf/cpu_private.h \
- surf/workstation_private.h \
- surf/surf_timer_private.h \
surf/surfxml_parse.c \
surf/simgrid_dtd.l \
surf/simgrid_dtd.c \
surf/surfxml_parse.c \
surf/simgrid_dtd.l \
surf/simgrid_dtd.c \
@@
-54,6
+51,8
@@
EXTRA_DIST= \
surf/gtnets/gtnets_simulator.h \
surf/gtnets/gtnets_topology.h \
\
surf/gtnets/gtnets_simulator.h \
surf/gtnets/gtnets_topology.h \
\
+ include/surf/surf_resource.h \
+ include/surf/datatypes.h \
include/surf/maxmin.h \
include/surf/trace_mgr.h \
include/surf/surf.h \
include/surf/maxmin.h \
include/surf/trace_mgr.h \
include/surf/surf.h \
@@
-82,7
+81,9
@@
EXTRA_DIST= \
include/simix/simix.h include/simix/datatypes.h \
simix/private.h \
\
include/simix/simix.h include/simix/datatypes.h \
simix/private.h \
\
- smpi/private.h
+ smpi/private.h \
+ smpi/smpi_coll_private.h \
+ smpi/README
#LIBRARY_VERSION= 0:0:0
# | | |
#LIBRARY_VERSION= 0:0:0
# | | |
@@
-168,15
+169,19
@@
XBT_SG_SRC = \
xbt/xbt_sg_time.c
SURF_SRC= \
xbt/xbt_sg_time.c
SURF_SRC= \
+ surf/surf_model.c \
+ surf/surf_action.c \
+ surf/surf_routing.c \
+ surf/surf_config.c \
surf/maxmin.c \
surf/maxmin.c \
- surf/fair_bottleneck.c
\
+ surf/fair_bottleneck.c \
surf/lagrange.c \
surf/trace_mgr.c \
surf/lagrange.c \
surf/trace_mgr.c \
- surf/random_mgr.c
\
+ surf/random_mgr.c \
surf/surf.c \
surf/surfxml_parse.c \
surf/cpu.c surf/network.c surf/network_constant.c surf/workstation.c \
surf/surf.c \
surf/surfxml_parse.c \
surf/cpu.c surf/network.c surf/network_constant.c surf/workstation.c \
- surf/surf_
timer.c
\
+ surf/surf_
model_timer.c
\
surf/workstation_ptask_L07.c \
xbt/xbt_sg_stubs.c
surf/workstation_ptask_L07.c \
xbt/xbt_sg_stubs.c
@@
-199,7
+204,6
@@
CTX_SRC= xbt/xbt_context.c
SIMIX_SRC= \
simix/smx_global.c \
simix/smx_deployment.c \
SIMIX_SRC= \
simix/smx_global.c \
simix/smx_deployment.c \
- simix/smx_config.c \
simix/smx_environment.c \
simix/smx_host.c \
simix/smx_process.c \
simix/smx_environment.c \
simix/smx_host.c \
simix/smx_process.c \
@@
-213,7
+217,8
@@
SMPI_SRC= \
smpi/smpi_mpi.c \
smpi/smpi_sender.c \
smpi/smpi_receiver.c \
smpi/smpi_mpi.c \
smpi/smpi_sender.c \
smpi/smpi_receiver.c \
- smpi/smpi_util.c
+ smpi/smpi_util.c \
+ smpi/smpi_coll.c
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
MSG_SRC= msg/msg_config.c \
msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@
-307,13
+312,6
@@
else
EXTRA_DIST+=$(GTNETS_SRC)
endif
EXTRA_DIST+=$(GTNETS_SRC)
endif
-if HAVE_SDP
- SDP_SRC= surf/sdp.c
-else
- SDP_SRC=
- EXTRA_DIST+=surf/sdp.c
-endif
-
###
### Declare the library content
###
###
### Declare the library content
###
@@
-323,7
+321,7
@@
lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.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
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
-libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED)
$(SDP_SRC)
\
+libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
$(SIMIX_SRC) $(CTX_SRC) \
$(MSG_SRC) $(SIMDAG_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
$(SIMIX_SRC) $(CTX_SRC) \
$(MSG_SRC) $(SIMDAG_SRC) \
$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)