]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'master' into 1_5_0
authorWlodek Wencel <wlodek@isc.org>
Thu, 13 Dec 2018 18:56:30 +0000 (19:56 +0100)
committerWlodek Wencel <wlodek@isc.org>
Thu, 13 Dec 2018 18:56:30 +0000 (19:56 +0100)
1  2 
configure.ac
src/lib/yang/Makefile.am

diff --cc configure.ac
Simple merge
index bf5717e350b313db6c8af9894eb97d5465ff1f46,25c025acc69ffc0cf848631be2bfc46a5c643969..8e91149d927f74fd28ca0f0a43ed43a04b9eba60
@@@ -64,23 -64,9 +64,24 @@@ libkea_yang_include_HEADERS = 
        translator_pool.h \
        translator_shared_network.h \
        translator_subnet.h \
-       yang_models.h
+       yang_models.h \
+       yang_revisions.h
  
  EXTRA_DIST = yang.dox
 +# Distribute yang modules.
 +EXTRA_DIST += models/ietf-dhcpv6-client.yang
 +EXTRA_DIST += models/ietf-dhcpv6-options.yang
 +EXTRA_DIST += models/ietf-dhcpv6-relay.yang
 +EXTRA_DIST += models/ietf-dhcpv6-server.yang
 +EXTRA_DIST += models/ietf-dhcpv6-types.yang
 +EXTRA_DIST += models/ietf-inet-types.yang
 +EXTRA_DIST += models/ietf-yang-types.yang
 +EXTRA_DIST += models/kea-ctrl-agent.yang
 +EXTRA_DIST += models/kea-dhcp-ddns.yang
 +EXTRA_DIST += models/kea-dhcp-types.yang
 +EXTRA_DIST += models/kea-dhcp4-server.yang
 +EXTRA_DIST += models/kea-dhcp6-server.yang
 +EXTRA_DIST += models/kea-logging.yang
 +EXTRA_DIST += models/kea-types.yang
  
  CLEANFILES = *.gcno *.gcda