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-login: add sd_machine_get_class() call
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index b7c38b6871b925ff42ef47784a988e6a8e97e3d9..bd78f444c506eee885597c9d783ccc60ab0da80d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-60,7
+60,7
@@
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_CURRENT=0
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=
1
+LIBSYSTEMD_REVISION=
2
LIBSYSTEMD_AGE=0
# Dirs of external packages
LIBSYSTEMD_AGE=0
# Dirs of external packages
@@
-207,8
+207,8
@@
define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g')
&& \
- $(LN_S) -
f $$so_img_rel_target_prefix
$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+
rm -f $(DESTDIR)$(libdir)/$$libname
&& \
+ $(LN_S) -
-relative -f $(DESTDIR)
$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
@@
-232,7
+232,6
@@
USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
-
GENERAL_ALIASES =
install-target-wants-hook:
GENERAL_ALIASES =
install-target-wants-hook:
@@
-268,9
+267,9
@@
install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
- dir=$(userunitdir) && $(install-aliases)
+ dir=$(userunitdir) && $(install-
relative-
aliases)
set -- $(GENERAL_ALIASES) && \
set -- $(GENERAL_ALIASES) && \
- dir= && $(install-aliases)
+ dir= && $(install-
relative-
aliases)
define install-aliases
while [ -n "$$1" ]; do \
define install-aliases
while [ -n "$$1" ]; do \
@@
-281,6
+280,15
@@
define install-aliases
done
endef
done
endef
+define install-relative-aliases
+ while [ -n "$$1" ]; do \
+ $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
+ rm -f $(DESTDIR)$$dir/$$2 && \
+ $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
+ shift 2 || exit $$?; \
+ done
+endef
+
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
@@
-303,6
+311,10
@@
AM_V_LN = $(AM_V_LN_$(V))
AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
AM_V_LN_0 = @echo " LN " $@;
AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
AM_V_LN_0 = @echo " LN " $@;
+AM_V_RM = $(AM_V_RM_$(V))
+AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
+AM_V_RM_0 = @echo " RM " $@;
+
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
@@
-353,7
+365,12
@@
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
+ shell-completion/bash/systemd-cat \
+ shell-completion/bash/systemd-cgls \
+ shell-completion/bash/systemd-cgtop \
shell-completion/bash/systemd-delta \
shell-completion/bash/systemd-delta \
+ shell-completion/bash/systemd-detect-virt \
+ shell-completion/bash/systemd-nspawn \
shell-completion/bash/systemd-run \
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
shell-completion/bash/systemd-run \
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
@@
-551,7
+568,10
@@
dist_doc_DATA = \
LICENSE.LGPL2.1 \
LICENSE.GPL2 \
LICENSE.MIT \
LICENSE.LGPL2.1 \
LICENSE.GPL2 \
LICENSE.MIT \
- DISTRO_PORTING
+ DISTRO_PORTING \
+ src/libsystemd/sd-bus/PORTING-DBUS1 \
+ src/libsystemd/sd-bus/DIFFERENCES \
+ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
@INTLTOOL_POLICY_RULE@
@INTLTOOL_POLICY_RULE@
@@
-771,7
+791,10
@@
libsystemd_shared_la_SOURCES = \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
- src/shared/bus-label.h
+ src/shared/bus-label.h \
+ src/shared/gpt.h \
+ src/shared/generator.h \
+ src/shared/generator.c
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-969,8
+992,6
@@
libsystemd_core_la_SOURCES = \
src/core/dbus-kill.h \
src/core/dbus-cgroup.c \
src/core/dbus-cgroup.h \
src/core/dbus-kill.h \
src/core/dbus-cgroup.c \
src/core/dbus-cgroup.h \
- src/core/dbus-client-track.c \
- src/core/dbus-client-track.h \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/selinux-access.c \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/selinux-access.c \
@@
-1006,7
+1027,9
@@
libsystemd_core_la_SOURCES = \
src/core/audit-fd.c \
src/core/audit-fd.h \
src/core/async.c \
src/core/audit-fd.c \
src/core/audit-fd.h \
src/core/async.c \
- src/core/async.h
+ src/core/async.h \
+ src/core/show-status.c \
+ src/core/show-status.h
if HAVE_KMOD
libsystemd_core_la_SOURCES += \
if HAVE_KMOD
libsystemd_core_la_SOURCES += \
@@
-1815,7
+1838,8
@@
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_SOURCES = \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_SOURCES = \
- src/gpt-auto-generator/gpt-auto-generator.c
+ src/gpt-auto-generator/gpt-auto-generator.c \
+ src/shared/blkid-util.h
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
@@
-1844,7
+1868,8
@@
systemd_dbus1_generator_LDADD = \
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
- $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+ $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+ $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
@@
-1939,14
+1964,16
@@
systemd_nspawn_SOURCES = \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(BLKID_LIBS)
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
@@
-1974,7
+2001,8
@@
systemd_bus_proxyd_LDADD = \
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
- $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+ $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
+ $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
@@
-2050,6
+2078,8
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-bus/bus-gvariant.c \
src/libsystemd/sd-bus/bus-gvariant.h \
src/libsystemd/sd-bus/bus-convenience.c \
src/libsystemd/sd-bus/bus-gvariant.c \
src/libsystemd/sd-bus/bus-gvariant.h \
src/libsystemd/sd-bus/bus-convenience.c \
+ src/libsystemd/sd-bus/bus-track.c \
+ src/libsystemd/sd-bus/bus-track.h \
src/libsystemd/sd-bus/bus-util.c \
src/libsystemd/sd-bus/bus-util.h \
src/libsystemd/sd-bus/bus-protocol.h \
src/libsystemd/sd-bus/bus-util.c \
src/libsystemd/sd-bus/bus-util.h \
src/libsystemd/sd-bus/bus-protocol.h \
@@
-2405,7
+2435,9
@@
libsystemd_network_la_SOURCES = \
src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
src/systemd/sd-dhcp-lease.h \
src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
src/systemd/sd-dhcp-lease.h \
+ src/systemd/sd-ipv4ll.h \
src/network/sd-network.c \
src/network/sd-network.c \
+ src/network/network-util.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/dhcp-option.c \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/dhcp-option.c \
@@
-2413,9
+2445,14
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/dhcp-internal.h \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
src/libsystemd-network/dhcp-internal.h \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
- src/libsystemd-network/sd-dhcp-lease.c
+ src/libsystemd-network/sd-dhcp-lease.c \
+ src/libsystemd-network/sd-ipv4ll.c \
+ src/libsystemd-network/ipv4ll-network.c \
+ src/libsystemd-network/ipv4ll-packet.c \
+ src/libsystemd-network/ipv4ll-internal.h
libsystemd_network_la_LIBADD = \
libsystemd_network_la_LIBADD = \
+ libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
@@
-2437,6
+2474,7
@@
test_dhcp_client_SOURCES = \
test_dhcp_client_LDADD = \
libsystemd-network.la \
test_dhcp_client_LDADD = \
libsystemd-network.la \
+ libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
@@
-2538,7
+2576,6
@@
dist_network_DATA = \
network/80-container-host0.network
dist_udevrules_DATA += \
network/80-container-host0.network
dist_udevrules_DATA += \
- rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
@@
-2555,6
+2592,9
@@
dist_udevrules_DATA += \
rules/80-net-setup-link.rules \
rules/95-udev-late.rules
rules/80-net-setup-link.rules \
rules/95-udev-late.rules
+nodist_udevrules_DATA += \
+ rules/99-systemd.rules
+
dist_udevhwdb_DATA = \
hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
dist_udevhwdb_DATA = \
hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
@@
-4047,6
+4087,16
@@
nodist_systemunit_DATA += \
GENERAL_ALIASES += \
$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
GENERAL_ALIASES += \
$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
+rootlibexec_PROGRAMS += \
+ systemd-networkd-wait-online
+
+systemd_networkd_wait_online_SOURCES = \
+ src/network/networkd-wait-online.c
+
+systemd_networkd_wait_online_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-network.la
+
test_network_SOURCES = \
src/network/test-network.c
test_network_SOURCES = \
src/network/test-network.c
@@
-4825,7
+4875,7
@@
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
-
../system-services
/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
+
$(dbussystemservicedir)
/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
if HAVE_SYSV_COMPAT
INSTALL_DIRS += \
if HAVE_SYSV_COMPAT
INSTALL_DIRS += \
@@
-4914,7
+4964,7
@@
kdbus-update:
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: upload
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: upload
-upload: all
distcheck
+upload: all
check dist
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
@@
-4931,7
+4981,7
@@
doc-sync: all destdir-sphinx
.PHONY: git-tag
git-tag:
.PHONY: git-tag
git-tag:
- git tag "v$(VERSION)" -m "systemd $(VERSION)"
+ git tag
-s
"v$(VERSION)" -m "systemd $(VERSION)"
.PHONY: install-tree
install-tree: all
.PHONY: install-tree
install-tree: all