diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index eea646a4..aee7eae9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,6 +64,8 @@ SYSTEMD_NM_CFLAGS_PATHS = \ -I$(top_srcdir)/src/systemd libsystemd_nm_la_SOURCES = \ + systemd/nm-sd.c \ + systemd/nm-sd.h \ systemd/nm-sd-adapt.c \ systemd/nm-sd-adapt.h \ systemd/src/basic/alloc-util.c \ @@ -71,6 +73,8 @@ libsystemd_nm_la_SOURCES = \ systemd/src/basic/async.h \ systemd/src/basic/escape.c \ systemd/src/basic/escape.h \ + systemd/src/basic/ether-addr-util.c \ + systemd/src/basic/ether-addr-util.h \ systemd/src/basic/fd-util.c \ systemd/src/basic/fd-util.h \ systemd/src/basic/fileio.c \ @@ -106,6 +110,7 @@ libsystemd_nm_la_SOURCES = \ systemd/src/basic/set.h \ systemd/src/basic/siphash24.c \ systemd/src/basic/siphash24.h \ + systemd/src/basic/socket-util.c \ systemd/src/basic/socket-util.h \ systemd/src/basic/sparse-endian.h \ systemd/src/basic/stdio-util.h \ @@ -138,14 +143,11 @@ libsystemd_nm_la_SOURCES = \ systemd/src/libsystemd-network/dhcp6-network.c \ systemd/src/libsystemd-network/dhcp6-option.c \ systemd/src/libsystemd-network/dhcp6-protocol.h \ - systemd/src/libsystemd-network/lldp-internal.c \ systemd/src/libsystemd-network/lldp-internal.h \ + systemd/src/libsystemd-network/lldp-neighbor.c \ + systemd/src/libsystemd-network/lldp-neighbor.h \ systemd/src/libsystemd-network/lldp-network.c \ systemd/src/libsystemd-network/lldp-network.h \ - systemd/src/libsystemd-network/lldp-port.c \ - systemd/src/libsystemd-network/lldp-port.h \ - systemd/src/libsystemd-network/lldp-tlv.c \ - systemd/src/libsystemd-network/lldp-tlv.h \ systemd/src/libsystemd-network/lldp.h \ systemd/src/libsystemd-network/network-internal.c \ systemd/src/libsystemd-network/network-internal.h \ @@ -156,6 +158,7 @@ libsystemd_nm_la_SOURCES = \ systemd/src/libsystemd-network/sd-ipv4acd.c \ systemd/src/libsystemd-network/sd-ipv4ll.c \ systemd/src/libsystemd-network/sd-lldp.c \ + systemd/src/libsystemd/sd-event/sd-event.c \ systemd/src/libsystemd/sd-id128/sd-id128.c \ systemd/src/shared/dns-domain.c \ systemd/src/shared/dns-domain.h \ @@ -287,6 +290,7 @@ libNetworkManager_la_SOURCES = \ \ dhcp-manager/nm-dhcp-client.c \ dhcp-manager/nm-dhcp-client.h \ + dhcp-manager/nm-dhcp-client-logging.h \ dhcp-manager/nm-dhcp-utils.c \ dhcp-manager/nm-dhcp-utils.h \ dhcp-manager/nm-dhcp-listener.c \ @@ -310,6 +314,8 @@ libNetworkManager_la_SOURCES = \ dnsmasq-manager/nm-dnsmasq-utils.c \ dnsmasq-manager/nm-dnsmasq-utils.h \ \ + platform/nmp-netns.c \ + platform/nmp-netns.h \ platform/nm-fake-platform.c \ platform/nm-fake-platform.h \ platform/nm-linux-platform.c \ @@ -462,6 +468,8 @@ nm_enum_types_sources = $(filter-out \ %/nm-device-private.h \ %/nm-rdisc-private.h \ %/wifi-utils-private.h \ + %/nm-dhcp-client-logging.h \ + %/nm-device-logging.h \ , $(libNetworkManager_la_SOURCES)) BUILT_SOURCES = $(GLIB_GENERATED) @@ -519,13 +527,16 @@ if WITH_LIBSOUP libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) endif -NetworkManager_LDFLAGS = -rdynamic +NetworkManager_LDFLAGS = \ + -rdynamic \ + -Wl,--version-script="$(srcdir)/NetworkManager.ver" ###################### libnm_iface_helper_la_SOURCES = \ dhcp-manager/nm-dhcp-client.c \ dhcp-manager/nm-dhcp-client.h \ + dhcp-manager/nm-dhcp-client-logging.h \ dhcp-manager/nm-dhcp-utils.c \ dhcp-manager/nm-dhcp-utils.h \ dhcp-manager/nm-dhcp-manager.c \ @@ -537,6 +548,8 @@ libnm_iface_helper_la_SOURCES = \ platform/nm-platform.h \ platform/nm-platform-utils.c \ platform/nm-platform-utils.h \ + platform/nmp-netns.c \ + platform/nmp-netns.h \ platform/nmp-object.c \ platform/nmp-object.h \ platform/wifi/wifi-utils-nl80211.c \ @@ -619,12 +632,13 @@ dbusservice_DATA = org.freedesktop.NetworkManager.conf EXTRA_DIST = \ $(dbusservice_DATA) \ - $(NetworkManager_DATA) + $(NetworkManager_DATA) \ + NetworkManager.ver rundir=$(runstatedir)/NetworkManager statedir=$(localstatedir)/lib/NetworkManager install-data-hook: - $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir) $(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) |