-INCLUDES = -I$(top_srcdir)/src/include
-AM_CFLAGS=-g -Wno-unused-function
-AM_LDFLAGS=-g
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
+AM_CFLAGS=-g
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
+CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot
+DISTCLEANFILES = gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
+EXTRA_DIST=run_tests.in \
+ xbt/graph.xml \
+ surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml\
+ simdag/availability_tremblay.txt simdag/small_platform_variable.xml
+
# Test stuff
-TESTS_PROGS= \
- dynar_int dynar_double dynar_string \
- dict_usage dict_crash \
- log_usage \
- config_usage
+xbt_tests = \
+ xbt/log_usage \
+ xbt/heap_bench \
+ xbt/graphxml_usage \
+ xbt/context_usage
-# multidict_crash
+SG_tests = \
+ surf/maxmin_bench surf/lmm_usage \
+ surf/trace_usage surf/surf_usage surf/surf_usage2
+simdag_tests = simdag/sd_test
-noinst_PROGRAMS = $(TESTS_PROGS) gs_example_send gs_example_receive
-noinst_SCRIPTS = gs_example
+check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage
+TESTS=run_tests
-dynar_int_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-dynar_double_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-dynar_string_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+ ./run_tests
+valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+ ./run_tests valgrind
-dict_usage_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-dict_crash_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-multidict_crash_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+# LDADD_UTILS is still a separate var to distinguish core tester from RL tester
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
+LDADD_RL=$(abs_top_builddir)/src/libgras.la
-config_usage_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+xbt_log_usage_LDADD= $(LDADD_RL)
-log_usage_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+xbt_heap_bench_LDADD= $(LDADD_RL)
+xbt_parallel_log_crashtest_LDADD= $(LDADD_RL)
-gs_example_send_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-gs_example_receive_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+xbt_graphxml_usage_LDADD= $(LDADD_SG)
-TESTS=$(TESTS_PROGS) #gs_example
+xbt_context_usage_LDADD= $(LDADD_SG)
+
+surf_maxmin_bench_LDADD= $(LDADD_SG)
+surf_lmm_usage_LDADD= $(LDADD_SG)
+surf_trace_usage_LDADD= $(LDADD_SG)
+surf_surf_usage_LDADD= $(LDADD_SG)
+surf_surf_usage2_LDADD= $(LDADD_SG)
+
+simdag_sd_test_LDADD= $(LDADD_SG)
+
+include $(top_srcdir)/acmacro/dist-files.mk
