[master] lib build order fix, ChangeLog updated after merge.

diff --git a/ChangeLog b/ChangeLog
index 140fcf0d7bd691c7b5f7010a3fdb5c26cfde9a92..936879b05c4cffe43b214e532fda4e4a9dbfd6f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1284.  [func]          tomek
+       A new library, lease_cmds, has been implemented. Its intended
+       purpose is to support commands for lease management. Currently
+       supported commands are: lease4-add, lease6-add, lease4-get,
+       lease6-get. Additional commands and documentation are planned.
+       (Trac #5272, #5279, git 785c2e521b198a03d26bde4a804638bfc19ce91b)
+
 1283.  [func]          fdupont
        An 'always-send' parameter has been added to options
        configuration.  It allows an option to be always sent, even if
@@ -11,7 +18,7 @@
        (Trac #5333, git xxx)
 
 1281.  [build]         tmark
-       Configure script now correctly recognizes static boost_system library as 
+       Configure script now correctly recognizes static boost_system library as
        well as checks for the presence of static glibc static libraries when
        --enable-satic-link is specified.
        (Trac #5337, git 42548148cbeaaa285519e121f493d52607f1e8a0)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6b8694cc454f1db52383067dc6390d63089d8d76..9de3269c323b393724c0278d18e75430836dbdc4 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,3 +1,3 @@
 # The following build order must be maintained.
-SUBDIRS = exceptions util log cryptolink dns cc asiolink testutils hooks dhcp config \
-             stats asiodns dhcp_ddns eval dhcpsrv cfgrpt process http
+SUBDIRS = exceptions util log cryptolink dns asiolink cc testutils hooks dhcp \
+          config stats asiodns dhcp_ddns eval dhcpsrv cfgrpt process http