From 26f208aec30cf1c9add0b3d37dc8781b291d87e1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 20 Feb 2020 14:12:31 +0100 Subject: core: add common base class NMDhcpConfig for NMDhcp[46]Config and merge them The advantage is that the API is now the same for IPv4 and IPv6: it's all nm_dhcp_config_*() and we can (easier) treat the address family generically. We still need two distinct GObject types, mainly because of the glue code for exposing the object on D-Bus as NMDBusObject. Of course, that could be solved differently, but as it is, it's quite nice. --- Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index b53b7e5613..3ca9eac098 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2279,8 +2279,6 @@ src_libNetworkManager_la_SOURCES = \ src/nm-netns.h \ src/nm-dhcp-config.c \ src/nm-dhcp-config.h \ - src/nm-dhcp6-config.c \ - src/nm-dhcp6-config.h \ src/nm-dispatcher.c \ src/nm-dispatcher.h \ src/nm-firewall-manager.c \ -- cgit v1.2.1