--- embedaddon/dhcp/common/tests/Makefile.am	2012/02/21 22:30:18	1.1
+++ embedaddon/dhcp/common/tests/Makefile.am	2012/10/09 09:06:54	1.1.1.1
@@ -1,10 +1,25 @@
-AM_CPPFLAGS = -I../..
+SUBDIRS = .
 
-check_PROGRAMS = test_alloc
+AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes
 
-TESTS = test_alloc
+EXTRA_DIST = Atffile
 
-test_alloc_SOURCES = test_alloc.c
-test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
+ATF_TESTS =
+
+if HAVE_ATF
+
+ATF_TESTS += alloc_unittest
+
+alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
+alloc_unittest_LDADD = $(ATF_LDFLAGS)
+alloc_unittest_LDADD += ../libdhcp.a  \
 	../../omapip/libomapi.a ../../dst/libdst.a ../../minires/libres.a
+
+check: $(ATF_TESTS)
+	atf-run | atf-report
+
+endif
+
+check_PROGRAMS = $(ATF_TESTS)
+