chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nss-myhostname: move local address listing logic into shared, so that we can make...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3ddbdf77d352a72d3d02b3aeece3a19f36a7ab6e..50e31dbe2d1917b45d96777b83b96c7fa0dd456c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-106,7
+106,6
@@
udevrulesdir=$(udevlibexecdir)/rules.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
-ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-337,7
+336,8
@@
rootbin_PROGRAMS = \
systemd-notify \
systemd-ask-password \
systemd-tty-ask-password-agent \
systemd-notify \
systemd-ask-password \
systemd-tty-ask-password-agent \
- systemd-machine-id-setup
+ systemd-machine-id-setup \
+ systemd-escape
bin_PROGRAMS = \
systemd-cgls \
bin_PROGRAMS = \
systemd-cgls \
@@
-2108,6
+2108,13
@@
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-shared.la
# ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+ src/escape/escape.c
+
+systemd_escape_LDADD = \
+ libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
systemctl_SOURCES = \
src/systemctl/systemctl.c
systemctl_SOURCES = \
src/systemctl/systemctl.c
@@
-2313,6
+2320,8
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-rtnl/rtnl-types.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
src/libsystemd/sd-rtnl/rtnl-types.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
+ src/libsystemd/sd-rtnl/local-addresses.h \
+ src/libsystemd/sd-rtnl/local-addresses.c \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c \
@@
-4312,10
+4321,6
@@
dist_systemunit_DATA += \
polkitpolicy_files += \
src/timedate/org.freedesktop.timedate1.policy
polkitpolicy_files += \
src/timedate/org.freedesktop.timedate1.policy
-INSTALL_DIRS += \
- $(prefix)/lib/systemd/ntp-units.d \
- $(sysconfdir)/systemd/ntp-units.d
-
SYSTEM_UNIT_ALIASES += \
systemd-timedated.service dbus-org.freedesktop.timedate1.service
SYSTEM_UNIT_ALIASES += \
systemd-timedated.service dbus-org.freedesktop.timedate1.service
@@
-4389,18
+4394,13
@@
EXTRA_DIST += \
CLEANFILES += \
src/timesync/timesyncd.conf
CLEANFILES += \
src/timesync/timesyncd.conf
-
-dist_ntpunits_DATA = \
- src/timesync/90-systemd.list
-
endif
# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
endif
# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
- src/nss-myhostname/nss-myhostname.c \
- src/nss-myhostname/ifconf.h \
- src/nss-myhostname/netlink.c
+ src/nss-myhostname/nss-myhostname.sym \
+ src/nss-myhostname/nss-myhostname.c
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
@@
-4408,7
+4408,8
@@
libnss_myhostname_la_LDFLAGS = \
-export-dynamic \
-avoid-version \
-shared \
-export-dynamic \
-avoid-version \
-shared \
- -shrext .so.2
+ -shrext .so.2 \
+ -Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym
libnss_myhostname_la_LIBADD = \
libsystemd-shared.la \
libnss_myhostname_la_LIBADD = \
libsystemd-shared.la \
@@
-4575,6
+4576,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-macvlan.c \
src/network/networkd-dummy.c \
src/network/networkd-tuntap.c \
src/network/networkd-macvlan.c \
src/network/networkd-dummy.c \
src/network/networkd-tuntap.c \
+ src/network/networkd-bond.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 \