From: Marcin Siodelski Date: Fri, 4 Nov 2016 20:04:09 +0000 (+0100) Subject: [master] Merge branch 'trac5016' X-Git-Tag: trac5057_base~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59b62eb3ddd9db62c04bd47cd8fbdc1af62fbc1b;p=thirdparty%2Fkea.git [master] Merge branch 'trac5016' --- 59b62eb3ddd9db62c04bd47cd8fbdc1af62fbc1b diff --cc src/lib/dhcp/Makefile.am index 5b49a70ace,199e34071f..b3cdbc1588 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@@ -28,7 -25,14 +28,8 @@@ libkea_dhcp___la_SOURCES += option6_cli libkea_dhcp___la_SOURCES += option6_ia.cc option6_ia.h libkea_dhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h libkea_dhcp___la_SOURCES += option6_iaprefix.cc option6_iaprefix.h + libkea_dhcp___la_SOURCES += option6_pdexclude.cc option6_pdexclude.h -libkea_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h -libkea_dhcp___la_SOURCES += option6_client_fqdn.cc option6_client_fqdn.h libkea_dhcp___la_SOURCES += option6_status_code.cc option6_status_code.h -libkea_dhcp___la_SOURCES += option_vendor.cc option_vendor.h -libkea_dhcp___la_SOURCES += option_vendor_class.cc option_vendor_class.h -libkea_dhcp___la_SOURCES += option_int.h -libkea_dhcp___la_SOURCES += option_int_array.h libkea_dhcp___la_SOURCES += option.cc option.h libkea_dhcp___la_SOURCES += option_custom.cc option_custom.h libkea_dhcp___la_SOURCES += option_data_types.cc option_data_types.h