From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 14 Aug 2012 12:58:12 +0000 (+0200)
Subject: [rt25901_atf] Added comments to {server,common}/Makefile.am,
X-Git-Tag: v4_3_0a1~77^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=261132438616c90c614a972b35b78126276eee21;p=thirdparty%2Fdhcp.git

[rt25901_atf] Added comments to {server,common}/Makefile.am,
 version reverted from 4.2.0-git to 4.2.0
---

diff --git a/common/Makefile.am b/common/Makefile.am
index 7199d4b98..eddef0585 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -10,4 +10,8 @@ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
 man_MANS = dhcp-eval.5 dhcp-options.5
 EXTRA_DIST = $(man_MANS)
 
+# 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
diff --git a/configure.ac b/configure.ac
index 0a77f9db2..41e64bb8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.2.0-git], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.2.0], [dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such
diff --git a/server/Makefile.am b/server/Makefile.am
index 3c2bba712..6cd3329f5 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,3 +1,7 @@
+# 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
 
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'