chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "build-sys: re-add old symbols for abi compat"
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e86075f23a0f70b91605cff9aa4ca19a631058ad..bf04d318403dcfa476cbf89eab264908f4b339a4 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-46,9
+46,9
@@
LIBGUDEV_CURRENT=2
LIBGUDEV_REVISION=0
LIBGUDEV_AGE=2
LIBGUDEV_REVISION=0
LIBGUDEV_AGE=2
-LIBSYSTEMD_CURRENT=
5
-LIBSYSTEMD_REVISION=
1
-LIBSYSTEMD_AGE=
5
+LIBSYSTEMD_CURRENT=
6
+LIBSYSTEMD_REVISION=
0
+LIBSYSTEMD_AGE=
6
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
@@
-190,6
+190,7
@@
AM_CPPFLAGS = \
-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+ -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
-DX_SERVER=\"$(bindir)/X\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-DX_SERVER=\"$(bindir)/X\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@
-1433,7
+1434,7
@@
EXTRA_DIST += \
test/c.service \
test/daughter.service \
test/d.service \
test/c.service \
test/daughter.service \
test/d.service \
- test/end.service \
+ test/end.service
.in
\
test/e.service \
test/f.service \
test/grandchild.service \
test/e.service \
test/f.service \
test/grandchild.service \
@@
-2193,6
+2194,11
@@
systemd_tmpfiles_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
+if HAVE_ACL
+systemd_tmpfiles_LDADD += \
+ libsystemd-acl.la
+endif
+
rootbin_PROGRAMS += \
systemd-tmpfiles
rootbin_PROGRAMS += \
systemd-tmpfiles
@@
-3321,7
+3327,7
@@
noinst_PROGRAMS += \
systemd-subterm
dist_pkgdata_DATA += \
systemd-subterm
dist_pkgdata_DATA += \
- src/libsystemd-terminal/unifont-glyph-array.bin
+ src/libsystemd-terminal/unifont-glyph-array.bin
nodist_userunit_DATA += \
units/user/systemd-consoled.service
nodist_userunit_DATA += \
units/user/systemd-consoled.service
@@
-3449,12
+3455,8
@@
test_unifont_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
-.PHONY: update-unifont
-update-unifont: tools/compile-unifont.py
- $(AM_V_GEN)$(PYTHON) $< \
- <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \
- >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
- @echo "unifont-glyph-array.bin has been regenerated"
+src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT)
+ $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
@@
-3552,13
+3554,14
@@
dist_udevrules_DATA += \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/60-keyboard.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/60-keyboard.rules \
- rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
rules/60-persistent-alsa.rules \
rules/60-persistent-storage.rules \
rules/64-btrfs.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
rules/60-persistent-alsa.rules \
rules/60-persistent-storage.rules \
rules/64-btrfs.rules \
+ rules/70-mouse.rules \
+ rules/70-touchpad.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
@@
-3750,7
+3753,8
@@
dist_udevhwdb_DATA = \
hwdb/20-OUI.hwdb \
hwdb/20-net-ifname.hwdb \
hwdb/60-keyboard.hwdb \
hwdb/20-OUI.hwdb \
hwdb/20-net-ifname.hwdb \
hwdb/60-keyboard.hwdb \
- hwdb/70-mouse.hwdb
+ hwdb/70-mouse.hwdb \
+ hwdb/70-touchpad.hwdb
EXTRA_DIST += \
units/systemd-hwdb-update.service.in
EXTRA_DIST += \
units/systemd-hwdb-update.service.in
@@
-4987,10
+4991,8
@@
BUSNAMES_TARGET_WANTS += \
org.freedesktop.locale1.busname
dist_pkgdata_DATA += \
org.freedesktop.locale1.busname
dist_pkgdata_DATA += \
- src/locale/kbd-model-map
-
-dist_noinst_SCRIPT = \
- src/locale/generate-kbd-model-map
+ src/locale/kbd-model-map \
+ src/locale/language-fallback-map
localectl_SOURCES = \
src/locale/localectl.c
localectl_SOURCES = \
src/locale/localectl.c
@@
-5268,24
+5270,22
@@
if HAVE_GCRYPT
rootlibexec_PROGRAMS += \
systemd-importd \
rootlibexec_PROGRAMS += \
systemd-importd \
- systemd-
import
+ systemd-
pull
systemd_importd_SOURCES = \
systemd_importd_SOURCES = \
- src/import/importd.c \
- src/import/importd.h
+ src/import/importd.c
systemd_importd_CFLAGS = \
$(AM_CFLAGS) \
systemd_importd_CFLAGS = \
$(AM_CFLAGS) \
- -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
- -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
- -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
+ -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\"
systemd_importd_LDADD = \
libsystemd-internal.la \
systemd_importd_LDADD = \
libsystemd-internal.la \
+ libsystemd-label.la \
libsystemd-shared.la
libsystemd-shared.la
-systemd_
import
_SOURCES = \
- src/import/
import
.c \
+systemd_
pull
_SOURCES = \
+ src/import/
pull
.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
@@
-5303,7
+5303,7
@@
systemd_import_SOURCES = \
src/import/qcow2-util.c \
src/import/qcow2-util.h
src/import/qcow2-util.c \
src/import/qcow2-util.h
-systemd_
import
_CFLAGS = \
+systemd_
pull
_CFLAGS = \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
@@
-5312,7
+5312,7
@@
systemd_import_CFLAGS = \
-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-systemd_
import
_LDADD = \
+systemd_
pull
_LDADD = \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \
@@
-5584,13
+5584,16
@@
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-link-bus.c \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
src/network/networkd-dhcp6.c \
src/network/networkd-network.c \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
src/network/networkd-dhcp6.c \
src/network/networkd-network.c \
+ src/network/networkd-network-bus.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-manager.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-manager.c \
+ src/network/networkd-manager-bus.c \
src/network/networkd-fdb.c \
src/network/networkd-address-pool.c
src/network/networkd-fdb.c \
src/network/networkd-address-pool.c
@@
-5665,14
+5668,33
@@
tests += \
test-network \
test-network-tables
test-network \
test-network-tables
+dist_systemunit_DATA += \
+ units/systemd-networkd.socket
+
nodist_systemunit_DATA += \
units/systemd-networkd.service \
units/systemd-networkd-wait-online.service
nodist_systemunit_DATA += \
units/systemd-networkd.service \
units/systemd-networkd-wait-online.service
+dist_systemunit_DATA_busnames += \
+ units/org.freedesktop.network1.busname
+
+dist_dbussystemservice_DATA += \
+ src/network/org.freedesktop.network1.service
+
+dist_dbuspolicy_DATA += \
+ src/network/org.freedesktop.network1.conf
+
GENERAL_ALIASES += \
GENERAL_ALIASES += \
+ $(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \
$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+SYSTEM_UNIT_ALIASES += \
+ systemd-networkd.service dbus-org.freedesktop.network1.service
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.network1.busname
+
EXTRA_DIST += \
src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf \
EXTRA_DIST += \
src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf \
@@
-6217,6
+6239,7
@@
substitutions = \
'|rootprefix=$(rootprefix)|' \
'|udevlibexecdir=$(udevlibexecdir)|' \
'|SUSHELL=$(SUSHELL)|' \
'|rootprefix=$(rootprefix)|' \
'|udevlibexecdir=$(udevlibexecdir)|' \
'|SUSHELL=$(SUSHELL)|' \
+ '|SULOGIN=$(SULOGIN)|' \
'|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \
'|KMOD=$(KMOD)|' \
'|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \
'|KMOD=$(KMOD)|' \
@@
-6556,7
+6579,7
@@
endif
#
# Require python when making dist
#
#
# Require python when making dist
#
-.PHONY: dist-check-python
+.PHONY: dist-check-python
dist-check-compat-libs dist-check-help
dist-check-python:
if !HAVE_PYTHON
@echo "*** python and python-lxml module must be installed and enabled in order to make dist"
dist-check-python:
if !HAVE_PYTHON
@echo "*** python and python-lxml module must be installed and enabled in order to make dist"
@@
-6569,6
+6592,14
@@
if !ENABLE_COMPAT_LIBS
@false
endif
@false
endif
+dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
+ for i in $(abspath $^); do \
+ if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \
+ echo "$(basename $$i) --help output is too wide:"; \
+ $$i --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
+ exit 1; \
+ fi; done
+
dist: dist-check-python dist-check-compat-libs
# check "broken" platforms limited toolchains for link breakage before we release
dist: dist-check-python dist-check-compat-libs
# check "broken" platforms limited toolchains for link breakage before we release