-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 gras/datadesc_usage.out datadesc_usage.out
+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 \
+ surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml
+
+# Data sets still to regenerate:
+# gras/datadesc.big64
+# gras/datadesc.big32_4
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
# Test stuff
-TESTS_PROGS= \
- dynar_int dynar_double dynar_string \
- dict_usage dict_crash \
- test_log \
- config_usage
+xbt_tests = \
+ xbt/dynar_int xbt/dynar_double xbt/dynar_string \
+ xbt/dict_usage xbt/dict_crash \
+ xbt/set_usage \
+ xbt/log_usage \
+ xbt/heap_bench \
+ xbt/swag_usage \
+ xbt/context_usage \
+ xbt/config_usage
+# xbt/multidict_crash
+
+RL_tests = \
+ gras/trp_tcp_client gras/trp_tcp_server \
+ gras/trp_file_client gras/trp_file_server \
+ gras/datadesc_usage
+
+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_SCRIPTS = run_tests gras/trp_tcp_usage
+TESTS=run_tests
+
+test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+ ./run_tests
+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
+
+xbt_log_usage_LDADD= $(LDADD_RL)
+
+xbt_dynar_int_LDADD= $(LDADD_RL)
+xbt_dynar_double_LDADD= $(LDADD_RL)
+xbt_dynar_string_LDADD= $(LDADD_RL)
+
+xbt_dict_usage_LDADD= $(LDADD_RL)
+xbt_dict_crash_LDADD= $(LDADD_RL)
+#xbt_multidict_crash_LDADD= $(LDADD_RL)
-# multidict_crash
+xbt_set_usage_LDADD= $(LDADD_RL)
+xbt_swag_usage_LDADD= $(LDADD_RL)
+xbt_config_usage_LDADD= $(LDADD_RL)
-noinst_PROGRAMS = $(TESTS_PROGS) gs_example_send gs_example_receive
-noinst_SCRIPTS = gs_example
+xbt_heap_bench_LDADD= $(LDADD_RL)
-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
+xbt_context_usage_LDADD= $(LDADD_SG)
-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
+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)
-config_usage_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+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)
-test_log_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_LDADD= $(LDADD_RL)
-gs_example_send_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-gs_example_receive_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
+ cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c
-TESTS=$(TESTS_PROGS) #gs_example
+include $(top_srcdir)/acmacro/dist-files.mk
