--- embedaddon/dhcp/common/Makefile.in	2012/02/21 22:30:18	1.1
+++ embedaddon/dhcp/common/Makefile.in	2012/10/09 09:06:54	1.1.1.1
@@ -82,6 +82,8 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+ATF_CFLAGS = @ATF_CFLAGS@
+ATF_LDFLAGS = @ATF_LDFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -180,7 +182,12 @@ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c c
 
 man_MANS = dhcp-eval.5 dhcp-options.5
 EXTRA_DIST = $(man_MANS)
-SUBDIRS = tests
+
+# We want to build this directory first, before descending into tests subdir.
+# The reason is that ideally the tests should link existing objects from this
+# directory. That eliminates any discrepancies between tested code and
+# production code. Sadly, we are not there yet.
+SUBDIRS = . tests
 all: all-recursive
 
 .SUFFIXES: