Revert "journal: do not check for number of files"

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5344b903329801727418c8ab1c68b93df6ca41f..620b4d22f054eccec4c1f70de126267b8fb332c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
@@ -5280,10 +5276,11 @@ systemd_importd_SOURCES = \
 
 systemd_importd_CFLAGS = \
        $(AM_CFLAGS) \
-       -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-import\"
+       -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\"
 
 systemd_importd_LDADD = \
        libsystemd-internal.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 systemd_pull_SOURCES = \
@@ -6219,6 +6216,7 @@ substitutions = \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
        '|SUSHELL=$(SUSHELL)|' \
+       '|SULOGIN=$(SULOGIN)|' \
        '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
        '|KMOD=$(KMOD)|' \
@@ -6558,7 +6556,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"
@@ -6571,6 +6569,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