cg_path_get_user_unit(): Did not correctly parse user-unit templates.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 440ba888a0afd228868bff2b77c2f5bf0a02b7a0..14f682755ac2a0209aade804af8b88e4626b925f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1433,7 +1433,7 @@ EXTRA_DIST += \
        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 \
@@ -3326,7 +3326,7 @@ noinst_PROGRAMS += \
        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
@@ -3454,12 +3454,8 @@ test_unifont_LDADD = \
        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
@@ -3557,13 +3553,14 @@ dist_udevrules_DATA += \
        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/70-mouse.rules \
+       rules/70-touchpad.rules \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
@@ -3755,7 +3752,8 @@ dist_udevhwdb_DATA = \
        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
@@ -5273,24 +5271,22 @@ if HAVE_GCRYPT
 
 rootlibexec_PROGRAMS += \
        systemd-importd \
-       systemd-import
+       systemd-pull
 
 systemd_importd_SOURCES = \
-       src/import/importd.c \
-       src/import/importd.h
+       src/import/importd.c
 
 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 \
+       libsystemd-label.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 \
@@ -5308,7 +5304,7 @@ systemd_import_SOURCES = \
        src/import/qcow2-util.c \
        src/import/qcow2-util.h
 
-systemd_import_CFLAGS = \
+systemd_pull_CFLAGS = \
        $(AM_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(XZ_CFLAGS) \
@@ -5317,7 +5313,7 @@ systemd_import_CFLAGS = \
        -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 \
@@ -5670,11 +5666,15 @@ tests += \
        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
 
 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
 
@@ -6222,6 +6222,7 @@ substitutions = \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
        '|SUSHELL=$(SUSHELL)|' \
+       '|SULOGIN=$(SULOGIN)|' \
        '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
        '|KMOD=$(KMOD)|' \
@@ -6561,7 +6562,7 @@ endif
 #
 # 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"
@@ -6574,6 +6575,14 @@ if !ENABLE_COMPAT_LIBS
        @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