X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1142f7585e066e768aa8758f9a537abc09f04d79..990b4c331449051f8476377ac6e67a02f639be5a:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 3502d3db99..93da8f04a8 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -33,14 +33,14 @@ xbt_tests =                                                      \
 RL_tests =                                              \
 	gras/trp_tcp_client   gras/trp_tcp_server       \
 	gras/trp_file_client  gras/trp_file_server      \
-	gras/datadesc_usage
+	gras/datadesc_usage                             
 
 SG_tests =                                              \
 	surf/maxmin_usage surf/maxmin_bench \
 	surf/trace_usage surf/surf_usage surf/surf_usage2 \
 	msg/msg_test
 
-check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+noinst_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
@@ -50,42 +50,45 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 	./run_tests valgrind
 
 # LDADD_UTILS is still a separate var to distinguish core tester from RL tester
-LDADD_UTILS=$(top_builddir)/src/libgras.la 
-LDADD_RL=   $(top_builddir)/src/libgras.la   
+LDADD_SG=$(top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(top_builddir)/src/libgras.la   
 
-xbt_log_usage_LDADD=          $(LDADD_UTILS)
+xbt_log_usage_LDADD=          $(LDADD_RL)
 
-xbt_dynar_int_LDADD=          $(LDADD_UTILS)
-xbt_dynar_double_LDADD=       $(LDADD_UTILS)
-xbt_dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_dynar_int_LDADD=          $(LDADD_RL)
+xbt_dynar_double_LDADD=       $(LDADD_RL)
+xbt_dynar_string_LDADD=       $(LDADD_RL)
 
-xbt_dict_usage_LDADD=         $(LDADD_UTILS)
-xbt_dict_crash_LDADD=         $(LDADD_UTILS)
-#xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
+xbt_dict_usage_LDADD=         $(LDADD_RL)
+xbt_dict_crash_LDADD=         $(LDADD_RL)
+#xbt_multidict_crash_LDADD=    $(LDADD_RL)
 
-xbt_set_usage_LDADD=          $(LDADD_UTILS)
-xbt_swag_usage_LDADD=         $(LDADD_UTILS)
+xbt_set_usage_LDADD=          $(LDADD_RL)
+xbt_swag_usage_LDADD=         $(LDADD_RL)
 
-xbt_config_usage_LDADD=       $(LDADD_UTILS)
+xbt_config_usage_LDADD=       $(LDADD_RL)
 
-xbt_heap_bench_LDADD=         $(LDADD_UTILS)
-xbt_context_usage_LDADD=      $(LDADD_UTILS)
+xbt_heap_bench_LDADD=         $(LDADD_RL)
 
-surf_maxmin_usage_LDADD=      $(LDADD_UTILS)
-surf_maxmin_bench_LDADD=      $(LDADD_UTILS)
-surf_trace_usage_LDADD=       $(LDADD_UTILS)
-surf_surf_usage_LDADD=        $(LDADD_UTILS)
-surf_surf_usage2_LDADD=       $(LDADD_UTILS)
+xbt_context_usage_LDADD=      $(LDADD_SG)
 
-msg_msg_test_LDADD=           $(LDADD_UTILS)
+surf_maxmin_usage_LDADD=      $(LDADD_SG)
+surf_maxmin_bench_LDADD=      $(LDADD_SG)
+surf_trace_usage_LDADD=       $(LDADD_SG)
+surf_surf_usage_LDADD=        $(LDADD_SG)
+surf_surf_usage2_LDADD=       $(LDADD_SG)
+
+msg_msg_test_LDADD=           $(LDADD_SG)
 
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)
 gras_trp_file_client_LDADD=    $(LDADD_RL)
 gras_trp_file_server_LDADD=    $(LDADD_RL)
 
-gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_SOURCES=   gras/datadesc_usage.c gras/datadesc_structs.c
 gras_datadesc_usage_LDADD=     $(LDADD_RL)
 
 gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
 	cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c
+
+include $(top_srcdir)/acmacro/dist-files.mk