at work

Makefile.am

@@ -1,5 +1,7 @@
 
-AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo
+AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
+
+SUBDIRS = tests
 
 SUFFIXES = .c .o
 AM_CFLAGS = -Wall
@@ -37,52 +39,6 @@ common_SOURCES = \
 run: $(sbin_PROGRAMS)
 	./cworker --port=9002
 
-if HAVE_VALGRIND
-VALGRIND_OPT = --tool=memcheck
-endif
-
-test: $(bin_TESTS)
-	@for test in $(bin_TESTS); do \
-	  echo ======= Test $${test} ======; \
-	  ./$${test}; \
-	  echo ====== Done $${test} ======; \
-	done
-
-
-valgrind: $(bin_TESTS)
-	@for test in $(bin_TESTS); do \
-	  echo ======= Test $${test} ======; \
-	  $(VALGRIND) $(VALGRIND_OPT) ./$${test}; \
-	  echo ====== Done $${test} ======; \
-	done
-
-bin_TESTS = \
-	cfparser_test \
-	clparser_test \
-	cflexer_test \
-	cfparser_test \
-	cllexer_test \
-	clparser_test \
-	jlexer_test \
-	jparser_test \
-	rcache_test
-
-noinst_PROGRAMS = $(bin_TESTS)
-#TESTS = $(bin_TESTS)
-
-cflexer_test_SOURCES = cflexer_test.c $(common_SOURCES)
-cfparser_test_SOURCES = cfparser_test.c $(common_SOURCES)
-cllexer_test_SOURCES = cllexer_test.c $(common_SOURCES)
-clparser_test_SOURCES = clparser_test.c $(common_SOURCES)
-jlexer_test_SOURCES = jlexer_test.c $(common_SOURCES)
-jparser_test_SOURCES = jparser_test.c $(common_SOURCES)
-rcache_test_SOURCES = rcache_test.c $(common_SOURCES)
-
-clean-local:
-	rm -rf autom4te.cache
-	rm -rf *~
-	rm -rf run log
-
 
 #install-data-local:
 #	test -z $(DESTDIR)$(APP_LIBDIR) || $(MKDIR_P) $(DESTDIR)$(APP_LIBDIR)
@@ -91,3 +47,8 @@ clean-local:
 #	test -z $(DESTDIR)$(APP_RUNDIR) || $(MKDIR_P) $(DESTDIR)$(APP_RUNDIR)
 #	test -z $(DESTDIR)$(APP_DATABASEDIR) || $(MKDIR_P) $(DESTDIR)$(APP_DATABASEDIR)
 #EOF
+
+clean-local:
+	rm -rf autom4te.cache
+	rm -rf *~
+	rm -rf run log