chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: add system-wide sd_network_get_domains() API
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index bb218d2d821ec5f7ced52d967c98ef49561c2160..b95ddf2b4cb06896a8bae1c74f6c0898f8cbd42b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-212,6
+212,7
@@
AM_CPPFLAGS = \
-I $(top_srcdir)/src/libsystemd/sd-bus \
-I $(top_srcdir)/src/libsystemd/sd-event \
-I $(top_srcdir)/src/libsystemd/sd-rtnl \
-I $(top_srcdir)/src/libsystemd/sd-bus \
-I $(top_srcdir)/src/libsystemd/sd-event \
-I $(top_srcdir)/src/libsystemd/sd-rtnl \
+ -I $(top_srcdir)/src/libsystemd/sd-network \
-I $(top_srcdir)/src/libsystemd-network \
-I $(top_srcdir)/src/libsystemd-terminal \
$(OUR_CPPFLAGS)
-I $(top_srcdir)/src/libsystemd-network \
-I $(top_srcdir)/src/libsystemd-terminal \
$(OUR_CPPFLAGS)
@@
-489,8
+490,7
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-switch-root.target \
- units/ldconfig.service
+ units/initrd-switch-root.target
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-918,6
+918,16
@@
libsystemd_label_la_CFLAGS = \
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
+# -----------------------------------------------------------------------------
+
+if ENABLE_LDCONFIG
+dist_systemunit_DATA += \
+ units/ldconfig.service
+
+SYSINIT_TARGET_WANTS += \
+ ldconfig.service
+endif
+
# ------------------------------------------------------------------------------
if HAVE_SECCOMP
# ------------------------------------------------------------------------------
if HAVE_SECCOMP
@@
-2440,7
+2450,8
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-login/sd-login.c \
src/libsystemd/sd-path/sd-path.c \
src/libsystemd/sd-network/sd-network.c \
src/libsystemd/sd-login/sd-login.c \
src/libsystemd/sd-path/sd-path.c \
src/libsystemd/sd-network/sd-network.c \
- src/libsystemd/sd-network/network-util.h
+ src/libsystemd/sd-network/network-util.h \
+ src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym \
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym \
@@
-4592,7
+4603,12
@@
EXTRA_DIST += \
if ENABLE_TIMESYNCD
systemd_timesyncd_SOURCES = \
src/timesync/timesyncd.c \
if ENABLE_TIMESYNCD
systemd_timesyncd_SOURCES = \
src/timesync/timesyncd.c \
- src/timesync/timesyncd.h
+ src/timesync/timesyncd-manager.c \
+ src/timesync/timesyncd-manager.h \
+ src/timesync/timesyncd-conf.c \
+ src/timesync/timesyncd-conf.h \
+ src/timesync/timesyncd-server.c \
+ src/timesync/timesyncd-server.h
nodist_systemd_timesyncd_SOURCES = \
src/timesync/timesyncd-gperf.c
nodist_systemd_timesyncd_SOURCES = \
src/timesync/timesyncd-gperf.c
@@
-4765,6
+4781,7
@@
systemd_resolved_SOURCES = \
src/resolve/resolved-bus.h \
src/resolve/resolved-link.h \
src/resolve/resolved-link.c \
src/resolve/resolved-bus.h \
src/resolve/resolved-link.h \
src/resolve/resolved-link.c \
+ src/resolve/resolved-def.h \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-dns-rr.h \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-dns-rr.h \
@@
-4934,6
+4951,7
@@
libsystemd_networkd_core_la_CFLAGS = \
libsystemd_networkd_core_la_SOURCES = \
src/libsystemd-network/network-internal.h \
src/network/networkd.h \
libsystemd_networkd_core_la_SOURCES = \
src/libsystemd-network/network-internal.h \
src/network/networkd.h \
+ src/network/networkd-link.h \
src/network/networkd-netdev.h \
src/network/networkd-netdev-tunnel.h \
src/network/networkd-netdev-veth.h \
src/network/networkd-netdev.h \
src/network/networkd-netdev-tunnel.h \
src/network/networkd-netdev-veth.h \
@@
-4955,6
+4973,8
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev-bond.c \
src/network/networkd-netdev-bridge.c \
src/network/networkd-link.c \
src/network/networkd-netdev-bond.c \
src/network/networkd-netdev-bridge.c \
src/network/networkd-link.c \
+ src/network/networkd-ipv4ll.c \
+ src/network/networkd-dhcp4.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
@@
-5779,8
+5799,7
@@
endif
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \
- systemd-update-done.service \
- ldconfig.service
+ systemd-update-done.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \