INCLUDES = -I$(top_srcdir)/src/include
-AM_CFLAGS=-g -Wno-unused-function
-AM_LDFLAGS=-g
+AM_CFLAGS=-g
CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
+MAINTAINERCLEANFILES=Makefile.in *~
+EXTRA_DIST=run_tests.in \
+ datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \
+ mk_datadesc_structs.pl
# Test stuff
-TESTS_PROGS= \
+core_tests = \
dynar_int dynar_double dynar_string \
dict_usage dict_crash \
- test_log \
- config_usage
-
+ set_usage \
+ log_usage \
+ config_usage
# multidict_crash
+RL_tests = \
+ trp_tcp_client trp_tcp_server \
+ trp_file_client trp_file_server \
+ datadesc_usage
+
+SG_tests =
+
+check_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
+check_SCRIPTS = run_tests 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_UTILS=$(top_srcdir)/src/base/libgrasrl.la
+LDADD_RL= $(top_srcdir)/src/base/libgrasrl.la
+
+log_usage_LDADD= $(LDADD_UTILS)
-noinst_PROGRAMS = $(TESTS_PROGS) gs_example_send gs_example_receive
-noinst_SCRIPTS = gs_example
+dynar_int_LDADD= $(LDADD_UTILS)
+dynar_double_LDADD= $(LDADD_UTILS)
+dynar_string_LDADD= $(LDADD_UTILS)
-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
+dict_usage_LDADD= $(LDADD_UTILS)
+dict_crash_LDADD= $(LDADD_UTILS)
+#multidict_crash_LDADD= $(LDADD_UTILS)
-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
+set_usage_LDADD= $(LDADD_UTILS)
-config_usage_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+config_usage_LDADD= $(LDADD_UTILS)
-test_log_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+trp_tcp_client_LDADD= $(LDADD_RL)
+trp_tcp_server_LDADD= $(LDADD_RL)
+trp_file_client_LDADD= $(LDADD_RL)
+trp_file_server_LDADD= $(LDADD_RL)
-gs_example_send_LDADD= $(top_srcdir)/src/base/libgrasutils.a
-gs_example_receive_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+datadesc_usage_SOURCES= datadesc_usage.c datadesc_structs.c
+datadesc_usage_LDADD= $(LDADD_RL)
-TESTS=$(TESTS_PROGS) #gs_example
+datadesc_structs.c: mk_datadesc_structs.pl
+ perl mk_datadesc_structs.pl > datadesc_structs.c