Version 0.5 (protocol not changed; ABI changed)

[simgrid.git] / testsuite / Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index fe372cc..4fd3052 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,10 +1,11 @@
 INCLUDES = -I$(top_srcdir)/src/include
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
+CLEANFILES = *~ test a.out *.o datadesc_usage.out
+MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
-  datadesc.i386 datadesc.ppc datadesc.sparc
+  datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \
+  mk_datadesc_structs.pl
 
 # Test stuff
 
@@ -12,8 +13,8 @@ core_tests =                                  \
        dynar_int dynar_double dynar_string   \
        dict_usage dict_crash                 \
        set_usage                             \
-       log_usage                             \
-       config_usage
+       log_usage                             
+#      config_usage
 # multidict_crash 
 
 RL_tests =                                    \
@@ -23,8 +24,8 @@ RL_tests =                                    \
 
 SG_tests =
 
-noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
-noinst_SCRIPTS = run_tests trp_tcp_usage
+check_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
+check_SCRIPTS = run_tests trp_tcp_usage
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -33,8 +34,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_srcdir)/src/base/libgrasrl.a 
-LDADD_RL=   $(top_srcdir)/src/base/libgrasrl.a   
+LDADD_UTILS=$(top_builddir)/src/base/libgrasrl.la 
+LDADD_RL=   $(top_builddir)/src/base/libgrasrl.la   
 
 log_usage_LDADD=          $(LDADD_UTILS)
 
@@ -55,5 +56,8 @@ trp_tcp_server_LDADD=     $(LDADD_RL)
 trp_file_client_LDADD=    $(LDADD_RL)
 trp_file_server_LDADD=    $(LDADD_RL)
 
+datadesc_usage_SOURCES= datadesc_usage.c datadesc_structs.c
 datadesc_usage_LDADD=     $(LDADD_RL)
 
+datadesc_structs.c: mk_datadesc_structs.pl
+       perl mk_datadesc_structs.pl > datadesc_structs.c