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
change the output directories
[simgrid.git]
/
testsuite
/
Makefile.in
diff --git
a/testsuite/Makefile.in
b/testsuite/Makefile.in
index
54df311
..
b447acd
100644
(file)
--- a/
testsuite/Makefile.in
+++ b/
testsuite/Makefile.in
@@
-149,6
+149,7
@@
ADDR2LINE = @ADDR2LINE@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CFLAGS = -g
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
@@
-184,6
+185,8
@@
GRAMINE_MODE_TRUE = @GRAMINE_MODE_TRUE@
GRAS_DEP = @GRAS_DEP@
HAVE_FLEXML_FALSE = @HAVE_FLEXML_FALSE@
HAVE_FLEXML_TRUE = @HAVE_FLEXML_TRUE@
GRAS_DEP = @GRAS_DEP@
HAVE_FLEXML_FALSE = @HAVE_FLEXML_FALSE@
HAVE_FLEXML_TRUE = @HAVE_FLEXML_TRUE@
+HAVE_SDP_FALSE = @HAVE_SDP_FALSE@
+HAVE_SDP_TRUE = @HAVE_SDP_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@
-218,6
+221,8
@@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIMGRID_DEP = @SIMGRID_DEP@
STRIP = @STRIP@
SHELL = @SHELL@
SIMGRID_DEP = @SIMGRID_DEP@
STRIP = @STRIP@
+USE_SIMIX_FALSE = @USE_SIMIX_FALSE@
+USE_SIMIX_TRUE = @USE_SIMIX_TRUE@
VERSION = @VERSION@
WARNING = @WARNING@
abs_builddir = @abs_builddir@
VERSION = @VERSION@
WARNING = @WARNING@
abs_builddir = @abs_builddir@
@@
-279,7
+284,6
@@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
target_os = @target_os@
target_vendor = @target_vendor@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
-AM_CFLAGS = -g
CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
testgraph.xml testgraph.dot
CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
testgraph.xml testgraph.dot
@@
-314,6
+318,9
@@
SG_tests = \
surf/maxmin_usage surf/maxmin_bench \
surf/trace_usage surf/surf_usage surf/surf_usage2
surf/maxmin_usage surf/maxmin_bench \
surf/trace_usage surf/surf_usage surf/surf_usage2
+#if HAVE_SDP
+# SG_tests+=surf/sdp_usage
+#endif
simdag_tests = simdag/sd_test
check_SCRIPTS = run_tests gras/trp_tcp_usage
TESTS = run_tests
simdag_tests = simdag/sd_test
check_SCRIPTS = run_tests gras/trp_tcp_usage
TESTS = run_tests
@@
-330,6
+337,10
@@
surf_maxmin_bench_LDADD = $(LDADD_SG)
surf_trace_usage_LDADD = $(LDADD_SG)
surf_surf_usage_LDADD = $(LDADD_SG)
surf_surf_usage2_LDADD = $(LDADD_SG)
surf_trace_usage_LDADD = $(LDADD_SG)
surf_surf_usage_LDADD = $(LDADD_SG)
surf_surf_usage2_LDADD = $(LDADD_SG)
+#if HAVE_SDP
+#surf_sdp_usage_LDADD= $(LDADD_SG)
+#surf_sdp_bench_LDADD= $(LDADD_SG)
+#endif
gras_trp_tcp_client_LDADD = $(LDADD_RL)
gras_trp_tcp_server_LDADD = $(LDADD_RL)
gras_trp_file_client_LDADD = $(LDADD_RL)
gras_trp_tcp_client_LDADD = $(LDADD_RL)
gras_trp_tcp_server_LDADD = $(LDADD_RL)
gras_trp_file_client_LDADD = $(LDADD_RL)