Index: /trunk/psLib/test/Makefile.am
===================================================================
--- /trunk/psLib/test/Makefile.am	(revision 24320)
+++ /trunk/psLib/test/Makefile.am	(revision 24321)
@@ -1,3 +1,3 @@
-SUBDIRS = tap pstap $(SRCDIRS)
+SUBDIRS = tap pstap optime $(SRCDIRS)
 
 TESTS = test.pl
Index: /trunk/psLib/test/math/Makefile.am
===================================================================
--- /trunk/psLib/test/math/Makefile.am	(revision 24320)
+++ /trunk/psLib/test/math/Makefile.am	(revision 24321)
@@ -43,5 +43,4 @@
 	tap_psStats08 \
 	tap_psStats09 \
-	tap_psStatsTiming \
 	tap_psFunc01 \
 	tap_psStats_Sample_01 \
Index: /trunk/psLib/test/optime/Makefile.am
===================================================================
--- /trunk/psLib/test/optime/Makefile.am	(revision 24321)
+++ /trunk/psLib/test/optime/Makefile.am	(revision 24321)
@@ -0,0 +1,27 @@
+AM_CPPFLAGS = \
+	$(SRCINC) \
+	-I$(top_srcdir)/test/tap/src \
+	-I$(top_srcdir)/test/pstap/src \
+	$(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(top_builddir)/test/pstap/src/libpstap.la \
+	$(PSLIB_LIBS)
+
+TEST_PROGS = \
+	tap_psStatsTiming
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(tmp_files) core core.* *~ *.bb *.bbg *.da gmon.out
+
+tests: $(check_PROGRAMS)
+	$(top_srcdir)/test/test.pl
+
+test: check