X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/362344047babd671360bd0911973400ffa5066f4..3d5a550c9ac944a71ea5f8e87ecef9e310fe497d:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9d9e2ec55f..b588e71a77 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,14 +1,16 @@
 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
-DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/*
+CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
+  testgraph.xml graph.dot
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* 
 MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
   gras/datadesc.little32 gras/datadesc.little32_4 \
   gras/datadesc.little64\
   gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
   gras/mk_datadesc_structs.pl \
+  xbt/graph.xml \
   surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml
 
 # Data sets still to regenerate:
@@ -21,6 +23,7 @@ EXTRA_DIST=run_tests.in \
 xbt_tests =                                                      \
 	xbt/log_usage                                            \
 	xbt/heap_bench                                           \
+	xbt/graphxml_usage                                       \
 	xbt/context_usage                                        
 
 RL_tests =                                              \
@@ -32,7 +35,7 @@ SG_tests =                                              \
 	surf/maxmin_usage surf/maxmin_bench \
 	surf/trace_usage surf/surf_usage surf/surf_usage2
 
-noinst_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
@@ -42,13 +45,15 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 	./run_tests valgrind
 
 # LDADD_UTILS is still a separate var to distinguish core tester from RL tester
-LDADD_SG=$(top_builddir)/src/libsimgrid.la 
-LDADD_RL=$(top_builddir)/src/libgras.la   
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
 
 xbt_log_usage_LDADD=          $(LDADD_RL)
 
 xbt_heap_bench_LDADD=         $(LDADD_RL)
 
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
+
 xbt_context_usage_LDADD=      $(LDADD_SG)
 
 surf_maxmin_usage_LDADD=      $(LDADD_SG)