Do generate the header we need with flexml

[simgrid.git] / testsuite / Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index cf622fb..d667155 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,15 +1,20 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+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.little64 gras/datadesc.big32 gras/datadesc.big64 \
-  gras/datadesc.aix gras/datadesc.win32 gras/datadesc.g5 \
+  gras/datadesc.little32 gras/datadesc.little32_4 \
+  gras/datadesc.little64\
+  gras/datadesc.big32 gras/datadesc.big32_8_4 \
   gras/mk_datadesc_structs.pl \
-  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.txt \
-  msg/platform.txt
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml \
+  msg/messages.h
+
+# Data sets still to regenerate:
+# gras/datadesc.big64 
+# gras/datadesc.big32_4 gras/datadesc.big32_2 
 
 
 # Test stuff
@@ -35,7 +40,7 @@ SG_tests =                                              \
        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
 
@@ -45,8 +50,8 @@ 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/libgrasrl.la 
-LDADD_RL=   $(top_builddir)/src/libgrasrl.la   
+LDADD_UTILS=$(top_builddir)/src/libgras.la 
+LDADD_RL=   $(top_builddir)/src/libgras.la   
 
 xbt_log_usage_LDADD=          $(LDADD_UTILS)